diff --git a/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt b/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt
index 350de2c..82de1c6 100644
--- a/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt
+++ b/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt
@@ -3,6 +3,7 @@ package com.swoosh.microblog.ui.feed
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import com.swoosh.microblog.data.CredentialsManager
 import com.swoosh.microblog.data.model.*
 import com.swoosh.microblog.data.repository.PostRepository
 import kotlinx.coroutines.flow.*
@@ -29,7 +30,9 @@ class FeedViewModel(application: Application) : AndroidViewModel(application) {
 
     init {
         observeLocalPosts()
-        refresh()
+        if (CredentialsManager(getApplication()).isConfigured) {
+            refresh()
+        }
     }
 
     private fun observeLocalPosts() {
diff --git a/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt b/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
index a33cc63..a4d043d 100644
--- a/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
@@ -37,6 +37,7 @@ fun SwooshNavGraph(
         composable(Routes.SETUP) {
             SetupScreen(
                 onSetupComplete = {
+                    feedViewModel.refresh()
                     navController.navigate(Routes.FEED) {
                         popUpTo(Routes.SETUP) { inclusive = true }
                     }