diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
index c5236f82d..758dcb824 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
@@ -70,7 +70,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     CachedInflater.from(this).clear();
 
     conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
-    Transformations.map(conversationListTabsViewModel.getState(), ConversationListTabsState::getTab)
+    Transformations.distinctUntilChanged(Transformations.map(conversationListTabsViewModel.getState(), ConversationListTabsState::getTab))
                    .observe(this, tab -> {
                      switch (tab) {
                        case CHATS: