diff --git a/scripts/riot b/scripts/riot
index 5745e95..ff8a7b9 100755
--- a/scripts/riot
+++ b/scripts/riot
@@ -93,7 +93,7 @@ parse_remote() {
     TRUST_SERVER=1
     PORT=""  # optional
     USERNAME=""  # optional
-    SSH_OPTIONS=("-o" "RequestTTY=yes")
+    SSH_OPTIONS=("-o" "RequestTTY=yes" "-o" "ServerAliveInterval=60")
     if [[ "$RIOT_TRUST_CLIENT" == "1" ]]; then
         SSH_OPTIONS+=("-o" "PermitLocalCommand=yes")
         if [[ "$(get_os_type)" != "msys" ]]; then