diff --git a/src/utils/storage/index.js b/src/utils/storage/index.js
index e31f97e1..cb6b73ff 100644
--- a/src/utils/storage/index.js
+++ b/src/utils/storage/index.js
@@ -1,9 +1,12 @@
 // @flow
 import {
-  ImmortalStorage, CookieStore, IndexedDbStore, LocalStorageStore, SessionStorageStore,
+  ImmortalStorage, IndexedDbStore, LocalStorageStore,
 } from 'immortal-db'
 
-const stores = [CookieStore, IndexedDbStore, LocalStorageStore, SessionStorageStore]
+// Don't use sessionStorage and cookieStorage
+// https://github.com/gruns/ImmortalDB/issues/22
+// https://github.com/gruns/ImmortalDB/issues/6
+const stores = [IndexedDbStore, LocalStorageStore]
 export const storage = new ImmortalStorage(stores)
 
 const PREFIX = 'v1'