diff --git a/mod_http2/h2_c2.c b/mod_http2/h2_c2.c
index c65a521a..5a9019aa 100644
--- a/mod_http2/h2_c2.c
+++ b/mod_http2/h2_c2.c
@@ -370,6 +370,13 @@ static apr_status_t h2_c2_filter_out(ap_filter_t* f, apr_bucket_brigade* bb)
     h2_conn_ctx_t *conn_ctx = h2_conn_ctx_get(f->c);
     apr_status_t rv;
 
+    if (bb == NULL) {
+#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 1)
+        f->c->data_in_output_filters = 0;
+#endif
+        return APR_SUCCESS;
+    }
+
    if (bb == NULL) {
 #if !AP_MODULE_MAGIC_AT_LEAST(20180720, 1)
         f->c->data_in_output_filters = 0;