diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
index f9756bf7805..5c561fa410b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
@@ -365,7 +365,7 @@ fun getStepOverAction(
         // Pretend we had already did a backing step
         methodLocations
                 .filter(::isLocationSuitable)
-                .first { it.ktLineNumber() == location.ktLineNumber() }
+                .firstOrNull { it.ktLineNumber() == location.ktLineNumber() } ?: location
     }
     else {
         location