diff --git a/ext/byebug/byebug.c b/ext/byebug/byebug.c
index 319ee2ad2..21a097910 100644
--- a/ext/byebug/byebug.c
+++ b/ext/byebug/byebug.c
@@ -676,6 +676,9 @@ Stoppable(VALUE self)
   if (post_mortem == Qtrue)
     return Qfalse;
 
+  if (RTEST(tracing))
+    return Qfalse;
+
   context = Current_context(self);
   if (!NIL_P(context))
   {
diff --git a/test/commands/continue_test.rb b/test/commands/continue_test.rb
index ab913226e..dcc81815f 100644
--- a/test/commands/continue_test.rb
+++ b/test/commands/continue_test.rb
@@ -68,5 +68,14 @@ def test_shows_error_if_specified_line_is_not_valid
 
       check_error_includes 'Line 100 is not a valid stopping point in file'
     end
+
+    def test_tracing_after_set_linetrace_and_continue
+      with_setting :linetrace, false do
+        enter 'set linetrace', 'cont'
+        debug_code(program)
+
+        check_output_includes "Tracing: #{example_path}:14   c = b + 5"
+      end
+    end
   end
 end