diff --git a/lib/guard.rb b/lib/guard.rb
index 6292faa..b41b0ec 100644
--- a/lib/guard.rb
+++ b/lib/guard.rb
@@ -122,8 +122,13 @@ module Guard
     #
     def stop
       UI.info 'Bye bye...', :reset => true
-      listener.stop
+
+      listener.lock
+      interactor.lock
+
       run_guard_task(:stop)
+
+      listener.stop
       abort
     end
 
diff --git a/lib/guard/listeners/linux.rb b/lib/guard/listeners/linux.rb
index b14bcb6..3e129c8 100644
--- a/lib/guard/listeners/linux.rb
+++ b/lib/guard/listeners/linux.rb
@@ -26,7 +26,6 @@ module Guard
     def stop
       super
       @stop = true
-      sleep(@latency)
     end
 
     # Check if the listener is usable on the current OS.