diff --git a/src/stores/device-profile.ts b/src/stores/device-profile.ts
index d68b31a9..565cfb5e 100644
--- a/src/stores/device-profile.ts
+++ b/src/stores/device-profile.ts
@@ -1,7 +1,7 @@
 import { DeviceProfile } from '@jellyfin/sdk/lib/generated-client'
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
-import { stateStorage } from '../constants/storage'
+import { mmkvStateStorage } from '../constants/storage'
 import { getDeviceProfile } from '../utils/device-profiles'
 import StreamingQuality from '../enums/audio-quality'
 
@@ -19,7 +19,7 @@ export const useStreamingDeviceProfileStore = create<DeviceProfileStore>()(
 			}),
 			{
 				name: 'streaming-device-profile-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),
@@ -40,7 +40,7 @@ export const useDownloadingDeviceProfileStore = create<DeviceProfileStore>()(
 			}),
 			{
 				name: 'downloading-device-profile-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),
diff --git a/src/stores/player/queue.ts b/src/stores/player/queue.ts
index 48876f91..8fdb5779 100644
--- a/src/stores/player/queue.ts
+++ b/src/stores/player/queue.ts
@@ -1,6 +1,6 @@
 import { Queue } from '@/src/player/types/queue-item'
 import JellifyTrack from '@/src/types/JellifyTrack'
-import { stateStorage } from '../../constants/storage'
+import { mmkvStateStorage } from '../../constants/storage'
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
 
@@ -63,7 +63,7 @@ export const usePlayerQueueStore = create<PlayerQueueStore>()(
 			}),
 			{
 				name: 'player-queue-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),
diff --git a/src/stores/settings/app.ts b/src/stores/settings/app.ts
index eeb764bf..b6984add 100644
--- a/src/stores/settings/app.ts
+++ b/src/stores/settings/app.ts
@@ -1,4 +1,4 @@
-import { stateStorage } from '../../constants/storage'
+import { mmkvStateStorage } from '../../constants/storage'
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
 
@@ -30,7 +30,7 @@ export const useAppSettingsStore = create<AppSettingsStore>()(
 			}),
 			{
 				name: 'app-settings-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),
diff --git a/src/stores/settings/player.ts b/src/stores/settings/player.ts
index 22611e2c..70937601 100644
--- a/src/stores/settings/player.ts
+++ b/src/stores/settings/player.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
-import { stateStorage } from '../../constants/storage'
+import { mmkvStateStorage } from '../../constants/storage'
 import { useStreamingDeviceProfileStore } from '../device-profile'
 import { useEffect } from 'react'
 import { getDeviceProfile } from '../../utils/device-profiles'
@@ -34,7 +34,7 @@ export const usePlayerSettingsStore = create<PlayerSettingsStore>()(
 			}),
 			{
 				name: 'player-settings-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),
diff --git a/src/stores/settings/swipe.ts b/src/stores/settings/swipe.ts
index 88123be6..ef614f1d 100644
--- a/src/stores/settings/swipe.ts
+++ b/src/stores/settings/swipe.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
-import { stateStorage } from '../../constants/storage'
+import { mmkvStateStorage } from '../../constants/storage'
 
 export type SwipeActionType = 'AddToQueue' | 'ToggleFavorite' | 'AddToPlaylist'
 
@@ -44,7 +44,7 @@ export const useSwipeSettingsStore = create<SwipeSettingsStore>()(
 			}),
 			{
 				name: 'swipe-settings-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),
diff --git a/src/stores/settings/usage.ts b/src/stores/settings/usage.ts
index 3d611384..80c2fddf 100644
--- a/src/stores/settings/usage.ts
+++ b/src/stores/settings/usage.ts
@@ -1,7 +1,7 @@
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
 import { Platform } from 'react-native'
-import { stateStorage } from '../../constants/storage'
+import { mmkvStateStorage } from '../../constants/storage'
 import StreamingQuality from '../../enums/audio-quality'
 
 export type DownloadQuality = StreamingQuality
@@ -26,7 +26,7 @@ export const useUsageSettingsStore = create<UsageSettingsStore>()(
 			}),
 			{
 				name: 'usage-settings-storage',
-				storage: createJSONStorage(() => stateStorage),
+				storage: createJSONStorage(() => mmkvStateStorage),
 			},
 		),
 	),