diff --git a/src/Uno.Extensions.Storage.UI/ServiceCollectionExtensions.cs b/src/Uno.Extensions.Storage.UI/ServiceCollectionExtensions.cs
index 46487244d..d58f5b7c2 100644
--- a/src/Uno.Extensions.Storage.UI/ServiceCollectionExtensions.cs
+++ b/src/Uno.Extensions.Storage.UI/ServiceCollectionExtensions.cs
@@ -63,7 +63,6 @@ public static IServiceCollection AddKeyedStorage(this IServiceCollection service
 					)
 #endif
 				.SetDefaultInstance<IKeyValueStorage>(
-#if WINUI
 #if __ANDROID__
 					KeyStoreKeyValueStorage.Name
 #elif __IOS__
@@ -72,24 +71,9 @@ public static IServiceCollection AddKeyedStorage(this IServiceCollection service
 					EncryptedApplicationDataKeyValueStorage.Name
 #else
 					// For WASM and other platforms where we don't currently have
-					// a secure storage option, we default to InMemory to avoid
+					// a secure storage option, we default to ApplicationDataKeyValueStorage to avoid
 					// security concerns with saving plain text
-					InMemoryKeyValueStorage.Name
-#endif
-
-#else
-#if __ANDROID__
-					PasswordVaultKeyValueStorage.Name
-#elif __IOS__
-					PasswordVaultKeyValueStorage.Name
-#elif WINDOWS_UWP
-					PasswordVaultKeyValueStorage.Name
-#else
-					// For WASM and other platforms where we don't currently have
-					// a secure storage option, we default to InMemory to avoid
-					// security concerns with saving plain text
-					InMemoryKeyValueStorage.Name
-#endif
+					ApplicationDataKeyValueStorage.Name
 #endif
 					);
 	}