diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_frame.py b/python/helpers/pydev/_pydevd_bundle/pydevd_frame.py
index 1728efb908df..106aa9f413be 100644
--- a/python/helpers/pydev/_pydevd_bundle/pydevd_frame.py
+++ b/python/helpers/pydev/_pydevd_bundle/pydevd_frame.py
@@ -611,7 +611,7 @@ class PyDBFrame:
                     self.do_wait_suspend(thread, frame, event, arg)
                     return self.trace_dispatch
                 else:
-                    if not breakpoint:
+                    if not breakpoint and not is_return:
                         # No stop from anyone and no breakpoint found in line (cache that).
                         frame_skips_cache[line_cache_key] = 0