diff --git a/proxstar/__init__.py b/proxstar/__init__.py
index 7df895d..1ff7818 100644
--- a/proxstar/__init__.py
+++ b/proxstar/__init__.py
@@ -59,7 +59,7 @@ ssh_tunnels = []
 auth = get_auth(app)
 
 redis_conn = Redis(app.config['REDIS_HOST'], app.config['REDIS_PORT'])
-q = Queue(connection=redis_conn)
+q = Queue(connection=redis_conn, default_timeout=360)
 scheduler = Scheduler(connection=redis_conn)
 
 engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI'])