diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index 05cd3e09c9..bf45093192 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -1256,14 +1256,14 @@ apr_table_t *cache_merge_headers_out(request_rec *r)
                                     r->err_headers_out);
     apr_table_clear(r->err_headers_out);
 
-    if (!apr_table_get(headers_out, "Content-Type")
-            && r->content_type) {
+    if (r->content_type
+            && !apr_table_get(headers_out, "Content-Type")) {
         apr_table_setn(headers_out, "Content-Type",
                        ap_make_content_type(r, r->content_type));
     }
 
-    if (!apr_table_get(headers_out, "Content-Encoding")
-            && r->content_encoding) {
+    if (r->content_encoding
+            && !apr_table_get(headers_out, "Content-Encoding")) {
         apr_table_setn(headers_out, "Content-Encoding",
                        r->content_encoding);
     }