diff --git a/src/uxbox/data/auth.cljs b/src/uxbox/data/auth.cljs
index e45a3d205..f9269d9aa 100644
--- a/src/uxbox/data/auth.cljs
+++ b/src/uxbox/data/auth.cljs
@@ -74,7 +74,7 @@
 (defrecord Logout []
   rs/UpdateEvent
   (-apply-update [_ state]
-    (assoc state :auth nil))
+    (st/get-initial-state))
 
   rs/WatchEvent
   (-apply-watch [_ state s]
diff --git a/src/uxbox/state.cljs b/src/uxbox/state.cljs
index 0959bf7da..69c47d11a 100644
--- a/src/uxbox/state.cljs
+++ b/src/uxbox/state.cljs
@@ -13,20 +13,24 @@
 
 (defonce state (atom {}))
 
+(defn get-initial-state
+  []
+  {:dashboard {:project-order :name
+               :project-filter ""}
+   :route nil
+   :auth (:uxbox/auth local-storage)
+   :clipboard #queue []
+   :profile nil
+   :workspace nil
+   :shapes-by-id {}
+   :elements-by-id {}
+   :colors-by-id {}
+   :icons-by-id {}
+   :projects-by-id {}
+   :pages-by-id {}})
+
 (defonce stream
-  (rs/init {:dashboard {:project-order :name
-                        :project-filter ""}
-            :route nil
-            :auth (:uxbox/auth local-storage)
-            :clipboard #queue []
-            :profile nil
-            :workspace nil
-            :shapes-by-id {}
-            :elements-by-id {}
-            :colors-by-id {}
-            :icons-by-id {}
-            :projects-by-id {}
-            :pages-by-id {}}))
+  (rs/init (get-initial-state)))
 
 (defn init
   "Initialize the state materialization."