diff --git a/ruby/rpc_server.rb b/ruby/rpc_server.rb
index c7f6837..ef69307 100755
--- a/ruby/rpc_server.rb
+++ b/ruby/rpc_server.rb
@@ -12,6 +12,12 @@ AMQP.start(:host => "localhost") do |connection|
   channel = AMQP::Channel.new(connection)
   queue   = channel.queue("rpc_queue")
 
+  Signal.trap("INT") do
+    connection.close do
+      EM.stop { exit }
+    end
+  end
+
   channel.prefetch(1)
 
   queue.subscribe(:ack => true) do |header, body|