diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ac6a039d2..229782b9d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -119,7 +119,6 @@
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:showWhenLocked="true"
         android:supportsRtl="true"
         tools:targetApi="tiramisu">
         <activity
@@ -128,7 +127,6 @@
             android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
-            android:showWhenLocked="true"
             android:supportsPictureInPicture="true"
             android:theme="@style/NormalTheme"
             android:windowSoftInputMode="adjustResize">
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
index 0e7a68ecd..df5e8f671 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
@@ -320,6 +320,7 @@ open class MainActivity : FlutterFragmentActivity() {
 
                     val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as android.app.KeyguardManager
                     val isLocked = keyguardManager.isKeyguardLocked
+                    setShowWhenLocked(isLocked)
                     if (isLocked) {
                         // device is locked, so access to content is limited to intent URI by default
                         fields[INTENT_DATA_KEY_SECURE_URIS] = listOf(uri.toString())