diff --git a/core/js/js.js b/core/js/js.js
index 12303d7dd9..f697f2b853 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -171,6 +171,7 @@ if(typeof localStorage !='undefined'){
 			return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
 		},
 		getItem:function(name){
+			if(localStorage.getItem(OC.localStorage.namespace+name)==null){return null;}
 			return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
 		}
 	};