diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt
index 7990a96c0..fa159b555 100644
--- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt
@@ -48,10 +48,11 @@ class SettingsViewModel @Inject constructor(
             .stateIn(
                 scope = viewModelScope,
                 // Starting eagerly means the user data is ready when the SettingsDialog is laid out
-                // for the first time. Without this the layout is done using the "Loading" text,
-                // then replaced with the user editable fields once loaded, however, the layout
-                // height doesn't change meaning all the fields are squashed into a small
+                // for the first time. Without this, due to b/221643630 the layout is done using the
+                // "Loading" text, then replaced with the user editable fields once loaded, however,
+                // the layout height doesn't change meaning all the fields are squashed into a small
                 // scrollable column.
+                // TODO: Change to SharingStarted.WhileSubscribed(5_000) when b/221643630 is fixed
                 started = SharingStarted.Eagerly,
                 initialValue = Loading
             )