diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt
index 616c7a4c0..cc10e50dc 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt
@@ -67,7 +67,7 @@ fun PermissionScreen(
 @Composable
 private fun ScreenContent(
     topAppBarTitle: String? = null,
-    permissionsInfo: Map<String, PermissionInfo?> = emptyMap(),
+    permissionsInfo: Map<String, PermissionInfo> = emptyMap(),
     onNavigateUp: () -> Unit = {},
     windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
 ) {
@@ -90,8 +90,7 @@ private fun ScreenContent(
             verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
         ) {
             items(items = permissionsInfo.keys.toList(), key = { it }) { permission ->
-                // Bail out if this is not a known permission for the OS
-                val permissionInfo = permissionsInfo.getValue(permission) ?: return@items
+                val permissionInfo = permissionsInfo.getValue(permission)
 
                 Info(
                     title = AnnotatedString(
diff --git a/app/src/main/java/com/aurora/store/viewmodel/details/PermissionViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/details/PermissionViewModel.kt
index 7e5e7b1e1..dcb11635c 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/details/PermissionViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/PermissionViewModel.kt
@@ -28,7 +28,7 @@ class PermissionViewModel @AssistedInject constructor(
         fun create(permissions: List<String>): PermissionViewModel
     }
 
-    private val _permissionsInfo = MutableStateFlow<Map<String, PermissionInfo?>>(emptyMap())
+    private val _permissionsInfo = MutableStateFlow<Map<String, PermissionInfo>>(emptyMap())
     val permissionsInfo = _permissionsInfo.asStateFlow()
 
     init {
@@ -36,7 +36,10 @@ class PermissionViewModel @AssistedInject constructor(
     }
 
     private fun fetchPermissions() {
-        _permissionsInfo.value = permissions.associateWith { getPermissionInfo(it) }
+        // Bail out if this is not a known permission for the OS
+        _permissionsInfo.value = permissions.mapNotNull { permission ->
+            getPermissionInfo(permission)?.let { info -> permission to info }
+        }.toMap()
     }
 
     private fun getPermissionInfo(permissionName: String): PermissionInfo? {