diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
index 6d31d851a..8cacc77de 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -494,8 +494,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         // Update available connection parameters, if the updated arguments are
         // for the current focused client - otherwise ignore them
         if ($scope.focusedClient && $scope.focusedClient === focusedClient)
-        $scope.menu.connectionParameters = focusedClient ?
-            ManagedClient.getArgumentModel(focusedClient) : {};
+            $scope.menu.connectionParameters = ManagedClient.getArgumentModel(focusedClient);
 
     });