diff --git a/Signal/src/ViewControllers/SignalsViewController.m b/Signal/src/ViewControllers/SignalsViewController.m
index 9311f50f4..a8cf33d44 100644
--- a/Signal/src/ViewControllers/SignalsViewController.m
+++ b/Signal/src/ViewControllers/SignalsViewController.m
@@ -364,7 +364,6 @@
     [self updateInboxCountLabel];
 
     self.isViewVisible = YES;
-    [self checkIfEmptyView];
 
     // When returning to home view, try to ensure that the "last" thread is still
     // visible.  The threads often change ordering while in conversation view due
@@ -384,6 +383,8 @@
                                           animated:NO];
         }
     }
+
+    [self checkIfEmptyView];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -438,6 +439,8 @@
     } else {
         [[NSNotificationCenter defaultCenter] removeObserver:self name:YapDatabaseModifiedNotification object:nil];
     }
+
+    [self checkIfEmptyView];
 }
 
 - (void)applicationWillEnterForeground:(NSNotification *)notification
@@ -846,6 +849,7 @@
     [self updateInboxCountLabel];
 
     if ([sectionChanges count] == 0 && [rowChanges count] == 0) {
+        [self checkIfEmptyView];
         return;
     }
 
@@ -902,6 +906,13 @@
     [self checkIfEmptyView];
 }
 
+- (void)setViewingThreadsIn:(CellState)viewingThreadsIn
+{
+    _viewingThreadsIn = viewingThreadsIn;
+
+    [self checkIfEmptyView];
+}
+
 - (void)checkIfEmptyView {
     [_tableView setHidden:NO];
     [_emptyBoxLabel setHidden:NO];