diff --git a/src/apps/remotedesktop/RemoteDesktop.cpp b/src/apps/remotedesktop/RemoteDesktop.cpp
index 5a9f64209b..d0452ce443 100644
--- a/src/apps/remotedesktop/RemoteDesktop.cpp
+++ b/src/apps/remotedesktop/RemoteDesktop.cpp
@@ -90,12 +90,10 @@ main(int argc, char *argv[])
 		}
 
 		if (strcmp(argv[i], "-s") == 0) {
-			if (argc <= i + 1 || sscanf(argv[i + 1], "%" B_SCNu16, &sshPort) != 1) {
-				print_usage(argv[0]);
-				return 2;
+			if((i + 1 < argc) && sscanf(argv[i + 1], "%" B_SCNu16, &sshPort) == 1) {
+				i++;
 			}
 
-			i++;
 			useSSH = true;
 			continue;
 		}