diff --git a/src/translate_c.zig b/src/translate_c.zig
index 09e720d28989fd60af2f3047df9031537ec83c5b..8b79dd53ab4599e99086d7d576546916a4c5fb75 100644
--- a/src/translate_c.zig
+++ b/src/translate_c.zig
@@ -5563,7 +5563,7 @@ fn parseCExpr(c: *Context, m: *MacroCtx, scope: *Scope) ParseError!Node {
         const ignore = try Tag.discard.create(c.arena, .{ .should_skip = false, .value = last });
         try block_scope.statements.append(ignore);
 
-        last = try parseCCondExpr(c, m, scope);
+        last = try parseCCondExpr(c, m, &block_scope.base);
         if (m.next().? != .Comma) {
             m.i -= 1;
             break;
diff --git a/test/behavior/translate_c_macros.h b/test/behavior/translate_c_macros.h
index bec73e20d635f59e17d1fa7ee389951b1941695c..490ca35726612c673bff8f98ec8aaa8cc9f7ca4d 100644
--- a/test/behavior/translate_c_macros.h
+++ b/test/behavior/translate_c_macros.h
@@ -37,3 +37,5 @@ union U {
 #define IGNORE_ME_10(x) (volatile const void)(x)
 
 #define UNION_CAST(X) (union U)(X)
+
+#define NESTED_COMMA_OPERATOR (1, (2, 3))
diff --git a/test/behavior/translate_c_macros.zig b/test/behavior/translate_c_macros.zig
index a67d315ffca8448809aff3a47f71ec8453fd5419..7f8a35f5a1938ddb1beb5ad53af6ace8ac137cc4 100644
--- a/test/behavior/translate_c_macros.zig
+++ b/test/behavior/translate_c_macros.zig
@@ -56,3 +56,9 @@ test "casting to union with a macro" {
     casted = h.UNION_CAST(d);
     try expectEqual(d, casted.d);
 }
+
+test "nested comma operator" {
+    if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
+
+    try expectEqual(@as(c_int, 3), h.NESTED_COMMA_OPERATOR);
+}
diff --git a/test/run_translated_c.zig b/test/run_translated_c.zig
index bc37b0766184712b67ad4a7e67895971dea87ae1..1e8f081c11d1acc1d6f396c598266c131d2a6c1a 100644
--- a/test/run_translated_c.zig
+++ b/test/run_translated_c.zig
@@ -1851,4 +1851,14 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void {
         \\    return 0;
         \\}
     , "");
+
+    cases.add("Nested comma operator in macro. Issue #11040",
+        \\#include <stdlib.h>
+        \\#define FOO (1, (2,  3))
+        \\int main(void) {
+        \\    int x = FOO;
+        \\    if (x != 3) abort();
+        \\    return 0;
+        \\}
+    , "");
 }