diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
index 4b12192c4cbdce451abcaa4bbeb4fcdb549e9de8..a8f6b2e67fcc6907b3e5c8d844972ce9395488fe 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
@@ -72,6 +72,7 @@ class QuasselService : LifecycleService(),
       updateNotification(notificationHandle)
       startForeground(notificationHandle.id, notificationHandle.builder.build())
     } else {
+      this.notificationHandle = null
       stopForeground(true)
     }
   }
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
index a981cdd53bde97fb35d536a33a8ec772f33430d2..beb5782ace16ab2a50ff8f4209b7f0e036d234b2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
@@ -150,13 +150,13 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
           progressBar.hide()
         }
         ConnectionState.INIT                                    -> {
-          progressBar.isIndeterminate = true
-        }
-        else                                                    -> {
           progressBar.isIndeterminate = false
           progressBar.progress = progress
           progressBar.max = max
         }
+        else                                                    -> {
+          progressBar.isIndeterminate = true
+        }
       }
     })