diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index b7e7a73..70515c6 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -540,6 +540,7 @@ environment's setup:
     # Set the WorkingDirectory and Environment values to match your environment.
     [Unit]
     Description=MediaGoblin Celeryd
+    After=rabbitmq-server.service
 
     [Service]
     User=mediagoblin
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index 9a67942..9fb783b 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -81,7 +81,6 @@ def get_celery_settings_dict(app_config, global_config,
                 'schedule': datetime.timedelta(minutes=frequency),
             }
         }
-        celery_settings['BROKER_HEARTBEAT'] = 1
 
     return celery_settings