diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ab1a326698..f84a60a332 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -239,7 +239,11 @@ class DeadlockWatchdogThread : public QThread {
 public:
     static const unsigned long HEARTBEAT_CHECK_INTERVAL_SECS = 1;
     static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
+#ifdef DEBUG
+    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 600 * USECS_PER_SECOND;
+#else
     static const unsigned long MAX_HEARTBEAT_AGE_USECS = 10 * USECS_PER_SECOND;
+#endif
 
     // Set the heartbeat on launch
     DeadlockWatchdogThread() {