diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt
index 55b598364c8b765cd9938d27a0adc3ed39abba62..91ce4ac692c7b7e7abddf20f79cb38e74f012d80 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt
@@ -49,7 +49,7 @@ fun ForumScreen(
         onCancelButtonClicked = { addDialogVisible.value = false }
     )
 
-    if (viewModel.forumList.value.isEmpty()) {
+    if (viewModel.noForumsYet.value) {
         NoForumsYet { addDialogVisible.value = true }
     } else {
         Row(modifier = Modifier.fillMaxWidth()) {
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt
index cb766dfa208f97579271f1ddaf59a84eea44293f..5b3e28d0833350cf018c3103d346acf053a84f6e 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt
@@ -77,6 +77,8 @@ class ForumViewModel @Inject constructor(
         }.sortedByDescending { it.timestamp }
     }
 
+    val noForumsYet = derivedStateOf { _fullForumList.isEmpty() }
+
     private val _selectedGroupItem = mutableStateOf<GroupItem?>(null)
     val selectedGroupItem = _selectedGroupItem.asState()