diff --git a/src/Analysis/Ast/Impl/Linting/UndefinedVariables/UndefinedVariablesWalker.cs b/src/Analysis/Ast/Impl/Linting/UndefinedVariables/UndefinedVariablesWalker.cs
index 7365bf08d..42ac73bf0 100644
--- a/src/Analysis/Ast/Impl/Linting/UndefinedVariables/UndefinedVariablesWalker.cs
+++ b/src/Analysis/Ast/Impl/Linting/UndefinedVariables/UndefinedVariablesWalker.cs
@@ -49,9 +49,7 @@ public override bool Walk(SuiteStatement node) {
                         HandleNonLocal(nls);
                         break;
                     case AugmentedAssignStatement augs:
-                        _suppressDiagnostics = true;
                         augs.Left?.Walk(new ExpressionWalker(this));
-                        _suppressDiagnostics = false;
                         augs.Right?.Walk(new ExpressionWalker(this));
                         break;
                     case AssignmentStatement asst:
diff --git a/src/Analysis/Ast/Test/AssignmentTests.cs b/src/Analysis/Ast/Test/AssignmentTests.cs
index cf3a54344..298454515 100644
--- a/src/Analysis/Ast/Test/AssignmentTests.cs
+++ b/src/Analysis/Ast/Test/AssignmentTests.cs
@@ -219,6 +219,15 @@ def __init__(self):
                 .Which.Should().HaveMembers("abc", "y", "__class__");
         }
 
+        [TestMethod, Priority(0)]
+        public async Task AugmentedAssignToUndefined() {
+            const string code = @"
+x += 1
+";
+            var analysis = await GetAnalysisAsync(code);
+            analysis.Should().NotHaveVariable("x");
+        }
+
         [TestMethod, Priority(0)]
         public async Task BaseInstanceVariable() {
             const string code = @"
diff --git a/src/Analysis/Ast/Test/LintUndefinedVarsTests.cs b/src/Analysis/Ast/Test/LintUndefinedVarsTests.cs
index cdee6b70f..dec8c849a 100644
--- a/src/Analysis/Ast/Test/LintUndefinedVarsTests.cs
+++ b/src/Analysis/Ast/Test/LintUndefinedVarsTests.cs
@@ -821,6 +821,18 @@ class Subclass(MyClass):
             d.Should().BeEmpty();
         }
 
+        [TestMethod, Priority(0)]
+        public async Task AugmentedAssignToUndefined() {
+            const string code = @"
+x += 1
+";
+            var d = await LintAsync(code);
+            d.Should().HaveCount(1);
+            d[0].ErrorCode.Should().Be(ErrorCodes.UndefinedVariable);
+            d[0].SourceSpan.Should().Be(2, 1, 2, 2);
+        }
+
+
         private async Task<IReadOnlyList<DiagnosticsEntry>> LintAsync(string code, InterpreterConfiguration configuration = null) {
             var analysis = await GetAnalysisAsync(code, configuration ?? PythonVersions.LatestAvailable3X);
             var a = Services.GetService<IPythonAnalyzer>();