diff --git a/lib/adhearsion/process.rb b/lib/adhearsion/process.rb
index <HASH>..<HASH> 100644
--- a/lib/adhearsion/process.rb
+++ b/lib/adhearsion/process.rb
@@ -59,6 +59,13 @@ module Adhearsion
 
     def request_stop
       Events.trigger_immediately :stop_requested
+      IMPORTANT_THREADS << Thread.new do
+        until Adhearsion.active_calls.count == 0
+          logger.trace "Stop requested but we still have #{Adhearsion.active_calls.count} active calls."
+          sleep 0.2
+        end
+        force_stop
+      end
     end
 
     def final_shutdown
[FEATURE] Shut down when call count reaches 0.