diff --git a/framework/assets/js/storage.js b/framework/assets/js/storage.js
index cb741a92..47858c93 100755
--- a/framework/assets/js/storage.js
+++ b/framework/assets/js/storage.js
@@ -431,7 +431,7 @@ PhoneGap.addConstructor(function() {
         };
     }
     
-    if (typeof window.localStorage === "undefined") {
+    if ((typeof window.localStorage == "undefined") || (window.localStorage == null)) {
         navigator.localStorage = window.localStorage = new CupcakeLocalStorage();
         PhoneGap.waitForInitialization("cupcakeStorage");
     }