diff --git a/src/apps/debugger/controllers/ThreadHandler.cpp b/src/apps/debugger/controllers/ThreadHandler.cpp
index c728dba3fd..72e519b70b 100644
--- a/src/apps/debugger/controllers/ThreadHandler.cpp
+++ b/src/apps/debugger/controllers/ThreadHandler.cpp
@@ -589,7 +589,8 @@ ThreadHandler::_HandleBreakpointHitStep(CpuState* cpuState)
 				}
 			}
 
-			if (fPreviousFrameAddress != 0) {
+			if (fPreviousFrameAddress != 0 && fSteppedOverFunctionAddress
+					!= cpuState->InstructionPointer()) {
 				TRACE_CONTROL("STEP_OVER: called function address %#" B_PRIx64
 					", previous frame address: %#" B_PRIx64 ", frame address: %#"
 					B_PRIx64 ", adding return info\n", fSteppedOverFunctionAddress,