diff --git a/.changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json b/.changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json
new file mode 100644
index 00000000000..3a20ce2e74a
--- /dev/null
+++ b/.changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "remove findings message from chat even when all issues are ignored"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
index 93df86fdad5..a8a29033859 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -682,14 +682,11 @@ class BrowserConnector(
                         CodeWhispererConstants.CodeAnalysisScope.AGENTIC
                     )
                 CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI()
-
-                // Remove findings messages from response payload
-                val rootNode = serializer.objectMapper.readTree(responsePayload) as ObjectNode
-                rootNode.remove("additionalMessages")
-                return serializer.objectMapper.writeValueAsString(rootNode)
             }
-
-            return responsePayload
+            // Remove findings messages from response payload
+            val rootNode = serializer.objectMapper.readTree(responsePayload) as ObjectNode
+            rootNode.remove("additionalMessages")
+            return serializer.objectMapper.writeValueAsString(rootNode)
         } catch (e: Exception) {
             LOG.error(e) { "Failed to parse findings message" }
             return responsePayload