diff --git a/sgx-catapult.rb b/sgx-catapult.rb
index 437c07391cae1bb8419044c9d06330aff1a62e12..57319d08f3adc2a053da73a85105527c4bcb848d 100755
--- a/sgx-catapult.rb
+++ b/sgx-catapult.rb
@@ -1032,11 +1032,13 @@ at_exit do
 		server.start do
 			["INT", "TERM"].each do |sig|
 				trap(sig) do
-					puts 'Shutting down gateway...'
-					SGXcatapult.shutdown
+					EM.defer do
+						puts 'Shutting down gateway...'
+						SGXcatapult.shutdown
 
-					puts 'Gateway has terminated.'
-					EM.stop
+						puts 'Gateway has terminated.'
+						EM.stop
+					end
 				end
 			end
 		end