diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyOverloadsInspection.kt b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyOverloadsInspection.kt
index e2d881a2cad4..1ba3abc82ebf 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyOverloadsInspection.kt
+++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyOverloadsInspection.kt
@@ -53,16 +53,12 @@ class PyOverloadsInspection : PyInspection() {
       val implementation = functions.lastOrNull { !PyiUtil.isOverload(it, myTypeEvalContext) }
 
       if (implementation == null) {
-        functions
-          .maxByOrNull { it.textOffset }
-          ?.let {
-            registerProblem(it.nameIdentifier, if (owner is PyClass) {
-              PyPsiBundle.message("INSP.overloads.series.overload.decorated.methods.should.always.be.followed.by.implementation")
-            }
-            else {
-              PyPsiBundle.message("INSP.overloads.series.overload.decorated.functions.should.always.be.followed.by.implementation")
-            })
-          }
+        registerProblem(functions.first().nameIdentifier, if (owner is PyClass) {
+          PyPsiBundle.message("INSP.overloads.series.overload.decorated.methods.should.always.be.followed.by.implementation")
+        }
+        else {
+          PyPsiBundle.message("INSP.overloads.series.overload.decorated.functions.should.always.be.followed.by.implementation")
+        })
       }
       else {
         if (implementation != functions.last()) {
diff --git a/python/testData/inspections/PyOverloadsInspection/noImplementation.py b/python/testData/inspections/PyOverloadsInspection/noImplementation.py
index c354030927c8..4c95d5774175 100644
--- a/python/testData/inspections/PyOverloadsInspection/noImplementation.py
+++ b/python/testData/inspections/PyOverloadsInspection/noImplementation.py
@@ -2,7 +2,7 @@ from typing import overload
 
 
 @overload
-def foo(value: None) -> None:
+def <warning descr="A series of @overload-decorated functions should always be followed by an implementation that is not @overload-ed">foo</warning>(value: None) -> None:
     pass
 
 
@@ -12,13 +12,13 @@ def foo(value: int) -> str:
 
 
 @overload
-def <warning descr="A series of @overload-decorated functions should always be followed by an implementation that is not @overload-ed">foo</warning>(value: str) -> str:
+def foo(value: str) -> str:
     pass
 
 
 class A:
     @overload
-    def foo(self, value: None) -> None:
+    def <warning descr="A series of @overload-decorated methods should always be followed by an implementation that is not @overload-ed">foo</warning>(self, value: None) -> None:
         pass
 
     @overload
@@ -26,5 +26,5 @@ class A:
         pass
 
     @overload
-    def <warning descr="A series of @overload-decorated methods should always be followed by an implementation that is not @overload-ed">foo</warning>(self, value: str) -> str:
+    def foo(self, value: str) -> str:
         pass
\ No newline at end of file