diff --git a/analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py b/analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py
index 021fab2c3e..f5e4195920 100644
--- a/analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py
+++ b/analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py
@@ -507,8 +507,6 @@ def construct_analyzer_cmd(self, result_handler):
 
             analyzer_mode = 'plist-multi-file'
             analyzer_cmd.extend(['-Xclang',
-                                 '-analyzer-opt-analyze-headers',
-                                 '-Xclang',
                                  '-analyzer-output=' + analyzer_mode,
                                  '-o', analyzer_output_file])
 
diff --git a/analyzer/tests/unit/test_analyzer_command.py b/analyzer/tests/unit/test_analyzer_command.py
index 33fabc9459..980d6f8f2f 100644
--- a/analyzer/tests/unit/test_analyzer_command.py
+++ b/analyzer/tests/unit/test_analyzer_command.py
@@ -63,3 +63,13 @@ def test_isystem_idirafter(self):
         result_handler = create_result_handler(analyzer)
         cmd = analyzer.construct_analyzer_cmd(result_handler)
         self.assertIn('-idirafter', cmd)
+
+    def test_no_analyze_headers(self):
+        """
+        Test that the -analyzer-opt-analyze-headers flag is NOT present in the
+        analyzer command.
+        """
+        analyzer = create_analyzer_sa()
+        result_handler = create_result_handler(analyzer)
+        cmd = analyzer.construct_analyzer_cmd(result_handler)
+        self.assertNotIn('-analyzer-opt-analyze-headers', cmd)