diff --git a/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js b/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
index a8c68460e..3d20b933c 100644
--- a/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
+++ b/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
@@ -121,6 +121,8 @@ angular.module('storage').provider('localStorageService', [function localStorage
 
         // Pull and parse value from internal storage, if present
         var data = storedItems[key];
+	if (!data || data === "undefined")
+    	    return null;
         if (data)
             return JSON.parse(data);