diff --git a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
index b093d9c0a64..5ce51de50bc 100644
--- a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
+++ b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
@@ -138,8 +138,14 @@ class DeviceDetailsFragmentFormatterImpl(
     }
 
     private suspend fun updateLayoutInternal(fragmentType: FragmentTypeModel) {
-        val items = viewModel.getItems(fragmentType) ?: return
-        val layout = viewModel.getLayout(fragmentType) ?: return
+        val items = viewModel.getItems(fragmentType) ?: run {
+            fragment.setLoading(false, false)
+            return
+        }
+        val layout = viewModel.getLayout(fragmentType) ?: run {
+            fragment.setLoading(false, false)
+            return
+        }
 
         val prefKeyToSettingId =
             items