diff --git a/client/local.cpp b/client/local.cpp
index e4930a7b..2744b7d3 100644
--- a/client/local.cpp
+++ b/client/local.cpp
@@ -179,8 +179,10 @@ bool compiler_only_rewrite_includes(const CompileJob &job)
     if (const char *rewrite_includes = getenv("ICECC_REMOTE_CPP")) {
         return (*rewrite_includes != '\0') && (*rewrite_includes != '0');
     }
-    if (compiler_is_clang(job) && const char *rewrite_includes = getenv("ICECC_CLANG_REMOTE_CPP")) {
-        return (*rewrite_includes != '\0') && (*rewrite_includes != '0');
+    if (compiler_is_clang(job)) {
+        if (const char *rewrite_includes = getenv("ICECC_CLANG_REMOTE_CPP")) {
+            return (*rewrite_includes != '\0') && (*rewrite_includes != '0');
+        }
     }
     return true;
 }