diff --git a/Persephone/MPDClient/Extensions/MPDClient+Connection.swift b/Persephone/MPDClient/Extensions/MPDClient+Connection.swift
index b18295b..9407ba6 100644
--- a/Persephone/MPDClient/Extensions/MPDClient+Connection.swift
+++ b/Persephone/MPDClient/Extensions/MPDClient+Connection.swift
@@ -40,7 +40,9 @@ extension MPDClient {
     let commandOperation = BlockOperation() { [unowned self] in
       self.sendCommand(command: .connect, userData: ["host": host, "port": port])
 
-      self.idle()
+      if self.isConnected {
+        self.idle()
+      }
     }
     commandQueue.addOperation(commandOperation)
   }