diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index a3f4226113..9c66f0678f 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -256,8 +256,9 @@ public class ThumbnailView extends FrameLayout {
       return new SettableFuture<>(false);
     }
 
-    if (this.slide != null && this.slide.getFastPreflightId() != null &&
-        this.slide.getFastPreflightId().equals(slide.getFastPreflightId()))
+    if (this.slide != null && this.slide.getFastPreflightId() != null      &&
+        Util.equals(this.slide.getThumbnailUri(), slide.getThumbnailUri()) &&
+        Util.equals(this.slide.getFastPreflightId(), slide.getFastPreflightId()))
     {
       Log.i(TAG, "Not re-loading slide for fast preflight: " + slide.getFastPreflightId());
       this.slide = slide;