diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c
index 74706e0d..a0af9f9b 100644
--- a/src/protocols/ssh/settings.c
+++ b/src/protocols/ssh/settings.c
@@ -421,14 +421,10 @@ guac_ssh_settings* guac_ssh_parse_args(guac_user* user,
         guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv,
                 IDX_LOCALE, NULL);
 
-    /* Read the client timezone. */
+    /* Read the timezone parameter, or use client handshake. */
     settings->timezone =
         guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv,
-                IDX_TIMEZONE, NULL);
-    
-    /* If timezone not explicitly set, try to pull from tunnel */
-    if (settings->timezone == NULL)
-        settings->timezone = user->info.timezone;
+                IDX_TIMEZONE, user->info.timezone);
 
     /* Parsing was successful */
     return settings;