diff --git a/awx/main/management/commands/run_callback_receiver.py b/awx/main/management/commands/run_callback_receiver.py
index b2ee842749..a73983b917 100644
--- a/awx/main/management/commands/run_callback_receiver.py
+++ b/awx/main/management/commands/run_callback_receiver.py
@@ -28,7 +28,7 @@ from awx.main.models import *
 # ZeroMQ
 import zmq
 
-MAX_REQUESTS = 20000
+MAX_REQUESTS = 10000
 WORKERS = 4
 
 class CallbackReceiver(object):
@@ -122,6 +122,10 @@ class CallbackReceiver(object):
                         w = Process(target=self.callback_worker, args=(queue_actual_worker[1],))
                         w.daemon = True
                         w.start()
+
+                        signal.signal(signal.SIGINT, shutdown_handler([w]))
+                        signal.signal(signal.SIGTERM, shutdown_handler([w]))
+
                         queue_actual_worker[2] = w
                 last_parent_events[message['job_id']] = job_parent_events
             consumer_subscriber.send("1")