diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
index bfab4abfcb..4e54c3af09 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
@@ -574,9 +574,20 @@ Sonia.scm.Main = Ext.extend(Ext.util.Observable, {
 });
 
 Ext.onReady(function(){
+  
+  function isLocalStorageAvailable(){
+   var mod = '__scm-manager';
+    try {
+        localStorage.setItem(mod, mod);
+        localStorage.removeItem(mod);
+        return true;
+    } catch(e) {
+        return false;
+    }
+  }
 
   var stateProvider;
-  if ( typeof(Storage) !== "undefined" ){
+  if (isLocalStorageAvailable()){
     if (debug){
       console.debug('use localStore to save application state');
     }