diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index bf9591e56..19a2cc72c 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once (__DIR__."/configs/navigation.php");
-require_once (__DIR__."/configs/ACL.php");
+require_once __DIR__."/configs/navigation.php";
+require_once __DIR__."/configs/ACL.php";
 
 require_once 'propel/runtime/lib/Propel.php';
 Propel::init(__DIR__."/configs/airtime-conf.php");
@@ -10,8 +10,8 @@ Propel::init(__DIR__."/configs/airtime-conf.php");
 $tz = ini_get('date.timezone') ? ini_get('date.timezone') : 'UTC';
 date_default_timezone_set($tz);
 
-require_once (__DIR__."/configs/constants.php");
-require_once (__DIR__."/configs/conf.php");
+require_once __DIR__."/configs/constants.php";
+require_once __DIR__."/configs/conf.php";
 require_once 'DB.php';
 
 require_once 'Soundcloud.php';
@@ -21,7 +21,7 @@ require_once 'Schedule.php';
 require_once 'Shows.php';
 require_once 'Users.php';
 require_once 'RabbitMq.php';
-
+require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 
 global $CC_CONFIG, $CC_DBC;
 $dsn = $CC_CONFIG['dsn'];
@@ -36,6 +36,9 @@ $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
 //Zend_Session::start();
 Zend_Validate::setDefaultNamespaces("Zend");
 
+$front = Zend_Controller_Front::getInstance();
+$front->registerPlugin(new RabbitMqPlugin());
+
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
 	protected function _initDoctype()
@@ -48,9 +51,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 	protected function _initHeadLink()
 	{
 		$view = $this->getResource('view');
-
 		$view->headLink()->appendStylesheet('/css/redmond/jquery-ui-1.8.8.custom.css');
-
         $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
 		$this->view->headLink()->appendStylesheet('/css/styles.css');
 	}
@@ -70,14 +71,17 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $view->headScript()->appendFile('/js/airtime/common/common.js','text/javascript');
     }
 
-    protected function _initViewHelpers(){
+    protected function _initViewHelpers()
+    {
         $view = $this->getResource('view');
         $view->addHelperPath('../application/views/helpers', 'Airtime_View_Helper');
     }
 
-    protected function _initTitle(){
+    protected function _initTitle()
+    {
         $view = $this->getResource('view');
         $view->headTitle(Application_Model_Preference::GetHeadTitle());
     }
+
 }
 
diff --git a/application/controllers/plugins/RabbitMqPlugin.php b/application/controllers/plugins/RabbitMqPlugin.php
new file mode 100644
index 000000000..3316f01b2
--- /dev/null
+++ b/application/controllers/plugins/RabbitMqPlugin.php
@@ -0,0 +1,9 @@
+<?php
+
+class RabbitMqPlugin extends Zend_Controller_Plugin_Abstract
+{
+    public function dispatchLoopShutdown()
+    {
+        RabbitMq::PushScheduleFinal();
+    }
+}
\ No newline at end of file
diff --git a/application/models/RabbitMq.php b/application/models/RabbitMq.php
index af5bffa02..e2749149c 100644
--- a/application/models/RabbitMq.php
+++ b/application/models/RabbitMq.php
@@ -3,30 +3,41 @@ require_once 'php-amqplib/amqp.inc';
 
 class RabbitMq
 {
+    static private $doPush = FALSE;
+
+    /**
+     * Sets a flag to push the schedule at the end of the request.
+     */
+    public static function PushSchedule() {
+        RabbitMq::$doPush = TRUE;
+    }
 
     /**
      * Push the current schedule to RabbitMQ, to be picked up by Pypo.
      * Will push the schedule in the range from 24 hours ago to 24 hours
      * in the future.
      */
-    public static function PushSchedule() {
+    public static function PushScheduleFinal()
+    {
         global $CC_CONFIG;
-        $conn = new AMQPConnection($CC_CONFIG["rabbitmq"]["host"],
-                                         $CC_CONFIG["rabbitmq"]["port"],
-                                         $CC_CONFIG["rabbitmq"]["user"],
-                                         $CC_CONFIG["rabbitmq"]["password"]);
-        $channel = $conn->channel();
-        $channel->access_request($CC_CONFIG["rabbitmq"]["vhost"], false, false, true, true);
+        if (RabbitMq::$doPush) {
+            $conn = new AMQPConnection($CC_CONFIG["rabbitmq"]["host"],
+                                             $CC_CONFIG["rabbitmq"]["port"],
+                                             $CC_CONFIG["rabbitmq"]["user"],
+                                             $CC_CONFIG["rabbitmq"]["password"]);
+            $channel = $conn->channel();
+            $channel->access_request($CC_CONFIG["rabbitmq"]["vhost"], false, false, true, true);
 
-        $EXCHANGE = 'airtime-schedule';
-        $channel->exchange_declare($EXCHANGE, 'direct', false, true);
+            $EXCHANGE = 'airtime-schedule';
+            $channel->exchange_declare($EXCHANGE, 'direct', false, true);
 
-        $data = json_encode(Schedule::ExportRangeAsJson());
-        $msg = new AMQPMessage($data, array('content_type' => 'text/plain'));
+            $data = json_encode(Schedule::ExportRangeAsJson());
+            $msg = new AMQPMessage($data, array('content_type' => 'text/plain'));
 
-        $channel->basic_publish($msg, $EXCHANGE);
-        $channel->close();
-        $conn->close();
+            $channel->basic_publish($msg, $EXCHANGE);
+            $channel->close();
+            $conn->close();
+        }
     }
 
 }