diff --git a/lib/byebug/interfaces/local_interface.rb b/lib/byebug/interfaces/local_interface.rb
index c9262f21e..ffb9ef579 100644
--- a/lib/byebug/interfaces/local_interface.rb
+++ b/lib/byebug/interfaces/local_interface.rb
@@ -44,10 +44,14 @@ def with_repl_like_sigint
     # Disables the Readline completion proc installed by IRB on ruby2.7
     def without_irb_completion
       orig_completion = Readline.completion_proc
-      Readline.completion_proc = nil
-      yield
-    ensure
-      Readline.completion_proc = orig_completion
+      return yield unless orig_completion
+
+      begin
+        Readline.completion_proc = nil
+        yield
+      ensure
+        Readline.completion_proc = orig_completion
+      end
     end
   end
 end