diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
index f62510098..56a47bbb6 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
@@ -25,6 +25,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.citra.citra_emu.activities.EmulationActivity
+import org.citra.citra_emu.utils.BuildUtil
 import org.citra.citra_emu.utils.FileUtil
 import org.citra.citra_emu.utils.Log
 import org.citra.citra_emu.utils.RemovableStorageHelper
@@ -685,6 +686,8 @@ object NativeLibrary {
     @Keep
     @JvmStatic
     fun getUserDirectory(uriOverride: Uri? = null): String {
+        BuildUtil.assertNotGooglePlay()
+
         val preferences: SharedPreferences =
             PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
 
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt
index 4cc141235..1798e89b9 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt
@@ -568,13 +568,15 @@ class SetupFragment : Fragment() {
             return@registerForActivityResult
         }
 
-        if (NativeLibrary.getUserDirectory(result) == "") {
-            SelectUserDirectoryDialogFragment.newInstance(
-                mainActivity,
-                R.string.invalid_selection,
-                R.string.invalid_user_directory
-            ).show(mainActivity.supportFragmentManager, SelectUserDirectoryDialogFragment.TAG)
-            return@registerForActivityResult
+        if (BuildConfig.FLAVOR != "googlePlay") {
+            if (NativeLibrary.getUserDirectory(result) == "") {
+                SelectUserDirectoryDialogFragment.newInstance(
+                    mainActivity,
+                    R.string.invalid_selection,
+                    R.string.invalid_user_directory
+                ).show(mainActivity.supportFragmentManager, SelectUserDirectoryDialogFragment.TAG)
+                return@registerForActivityResult
+            }
         }
 
         CitraDirectoryHelper(requireActivity(), true).showCitraDirectoryDialog(result, pageButtonCallback, checkForButtonState)
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt
index 3a789b8b5..1f46a7d25 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt
@@ -367,13 +367,15 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 return@registerForActivityResult
             }
 
-            if (NativeLibrary.getUserDirectory(result) == "") {
-                SelectUserDirectoryDialogFragment.newInstance(
-                    this,
-                    R.string.invalid_selection,
-                    R.string.invalid_user_directory
-                ).show(supportFragmentManager, SelectUserDirectoryDialogFragment.TAG)
-                return@registerForActivityResult
+            if (BuildConfig.FLAVOR != "googlePlay") {
+                if (NativeLibrary.getUserDirectory(result) == "") {
+                    SelectUserDirectoryDialogFragment.newInstance(
+                        this,
+                        R.string.invalid_selection,
+                        R.string.invalid_user_directory
+                    ).show(supportFragmentManager, SelectUserDirectoryDialogFragment.TAG)
+                    return@registerForActivityResult
+                }
             }
 
             CitraDirectoryHelper(this@MainActivity, permissionsLost)