diff --git a/scripts/riot b/scripts/riot
index fd6dcb2..bf8d772 100755
--- a/scripts/riot
+++ b/scripts/riot
@@ -101,7 +101,7 @@ parse_remote() {
         SSH_OPTIONS+=("-o" "PermitLocalCommand=yes")
         if [[ "$(get_os_type)" != "msys" ]]; then
             test "$DFS_DRY_RUN" = "1" || mkdir -p ~/.ssh/master-socket
-            SSH_OPTIONS+=("-o" "ControlMaster=auto" "-o" "ControlPath=~/.ssh/master-socket/%C")
+            SSH_OPTIONS+=("-o" "ControlMaster=auto" "-o" "ControlPersist=60s" "-o" "ControlPath=~/.ssh/master-socket/%C")
         fi
     fi
     # handle input