diff --git a/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js b/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
index 593cc716b..f3af8d821 100644
--- a/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
+++ b/guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
@@ -30,6 +30,12 @@ angular.module('form').controller('selectFieldController', ['$scope', '$injector
     // Required services
     var translationStringService = $injector.get('translationStringService');
 
+    // Interpret undefined/null as empty string
+    $scope.$watch('model', function setModel(model) {
+        if (!model && model !== '')
+            $scope.model = '';
+    });
+
     /**
      * Produces the translation string for the given field option
      * value. The translation string will be of the form: