diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index ffd10c1e3..91b3ac5c8 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -626,6 +626,11 @@ typedef enum : NSUInteger {
                                                                                rowChanges:&messageRowChanges
                                                                          forNotifications:notifications
                                                                              withMappings:self.messageMappings];
+    
+    if (!messageRowChanges) {
+        return;
+    }
+    
     for (YapDatabaseViewRowChange *rowChange in messageRowChanges)
     {
         switch (rowChange.type)