diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs
index e308c35b21..617e8e255c 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs
@@ -68,20 +68,24 @@ public static bool IsDisposeImplementation([NotNullWhen(returnValue: true)] this
     /// </summary>
     public static bool IsAsyncDisposeImplementation([NotNullWhen(returnValue: true)] this IMethodSymbol? method, [NotNullWhen(returnValue: true)] INamedTypeSymbol? iAsyncDisposable, [NotNullWhen(returnValue: true)] INamedTypeSymbol? valueTaskType)
     {
-        if (method == null)
+        while (true)
         {
-            return false;
-        }
+            if (method == null)
+            {
+                return false;
+            }
 
-        if (method.IsOverride)
-        {
-            return method.OverriddenMethod.IsAsyncDisposeImplementation(iAsyncDisposable, valueTaskType);
-        }
+            if (method.IsOverride)
+            {
+                method = method.OverriddenMethod;
+                continue;
+            }
 
-        // Identify the implementor of IAsyncDisposable.Dispose in the given method's containing type and check
-        // if it is the given method.
-        return SymbolEqualityComparer.Default.Equals(method.ReturnType, valueTaskType) &&
-            method.Parameters.IsEmpty &&
-            method.IsImplementationOfInterfaceMethod(null, iAsyncDisposable, "DisposeAsync");
+            // Identify the implementor of IAsyncDisposable.Dispose in the given method's containing type and check
+            // if it is the given method.
+            return SymbolEqualityComparer.Default.Equals(method.ReturnType, valueTaskType) &&
+                   method.Parameters.IsEmpty &&
+                   method.IsImplementationOfInterfaceMethod(null, iAsyncDisposable, "DisposeAsync");
+        }
     }
 }