diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
index 72fe99c75d..8b2ccc590c 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
@@ -57,7 +57,10 @@ public class RuffyScripter {
     public void start() {
         try {
             ruffyService.addHandler(mHandler);
-            idleDisconnectMonitorThread.start();
+            // TODO this'll be done better in v2 via ConnectionManager
+            if (idleDisconnectMonitorThread.getState() == Thread.State.NEW) {
+                idleDisconnectMonitorThread.start();
+            }
             started = true;
         } catch (RemoteException e) {
             throw new RuntimeException(e);