diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index ae20ab52d9..1702d926f2 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -88,7 +88,6 @@ class Thumbnail extends StatefulWidget {
 }
 
 class _ThumbnailState extends State<Thumbnail> {
-  ui.Image? _thumbhashImage;
   ui.Image? _providerImage;
   ImageStream? _imageStream;
   ImageStreamListener? _imageStreamListener;
@@ -104,9 +103,17 @@ class _ThumbnailState extends State<Thumbnail> {
   @override
   void didUpdateWidget(Thumbnail oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.imageProvider != widget.imageProvider ||
-        oldWidget.blurhash != widget.blurhash ||
-        (oldWidget.thumbhashMode == ThumbhashMode.disabled && oldWidget.thumbhashMode != ThumbhashMode.disabled)) {
+    if (widget.imageProvider != oldWidget.imageProvider) {
+      return _loadImage();
+    }
+
+    if (_providerImage != null) {
+      return;
+    }
+
+    if ((oldWidget.thumbhashMode == ThumbhashMode.disabled && widget.thumbhashMode != ThumbhashMode.disabled) ||
+        (oldWidget.thumbhashMode == ThumbhashMode.only && widget.thumbhashMode != ThumbhashMode.only) ||
+        (widget.thumbhashMode != ThumbhashMode.disabled && oldWidget.blurhash != widget.blurhash)) {
       _loadImage();
     }
   }
@@ -119,13 +126,13 @@ class _ThumbnailState extends State<Thumbnail> {
 
   void _loadImage() {
     _stopListeningToStream();
-    if (widget.thumbhashMode != ThumbhashMode.disabled && widget.blurhash != null) {
-      _decodeThumbhash();
-    }
-
     if (widget.thumbhashMode != ThumbhashMode.only && widget.imageProvider != null) {
       _loadFromProvider();
     }
+
+    if (widget.thumbhashMode != ThumbhashMode.disabled && widget.blurhash != null) {
+      _decodeThumbhash();
+    }
   }
 
   void _loadFromProvider() {
@@ -137,7 +144,6 @@ class _ThumbnailState extends State<Thumbnail> {
       (ImageInfo imageInfo, bool synchronousCall) {
         if (!mounted) return;
 
-        _thumbhashImage?.dispose();
         if (_providerImage != imageInfo.image) {
           setState(() {
             _providerImage = imageInfo.image;
@@ -220,7 +226,7 @@ class _ThumbnailState extends State<Thumbnail> {
     );
 
     return _ThumbnailLeaf(
-      image: _providerImage ?? _thumbhashImage,
+      image: _providerImage,
       fit: widget.fit,
       placeholderGradient: gradient,
     );
@@ -229,7 +235,7 @@ class _ThumbnailState extends State<Thumbnail> {
   @override
   void dispose() {
     _stopListeningToStream();
-    _thumbhashImage?.dispose();
+    _providerImage?.dispose();
     super.dispose();
   }
 }
@@ -302,7 +308,7 @@ class _ThumbnailRenderBox extends RenderBox {
           markNeedsPaint();
         });
       } else {
-        // _previousImage?.dispose();
+        _previousImage?.dispose();
         _previousImage = null;
         _fadeStartTime = null;
       }
@@ -347,7 +353,7 @@ class _ThumbnailRenderBox extends RenderBox {
 
     final time = DateTime.now();
     if (time.difference(_lastImageRequest).inMilliseconds >= 16) {
-      _fadeStartTime = DateTime.now();
+      _fadeStartTime = time;
       _previousImage = _image;
     }
     _image = value;
@@ -376,4 +382,10 @@ class _ThumbnailRenderBox extends RenderBox {
       markNeedsPaint();
     }
   }
+
+  @override
+  dispose() {
+    _previousImage?.dispose();
+    super.dispose();
+  }
 }
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index 171b9a40f1..ab82a7f452 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -78,16 +78,34 @@ class ThumbnailTile extends ConsumerWidget {
                     tag: '${asset?.heroTag ?? ''}_$heroIndex',
                     child: Thumbnail.fromBaseAsset(
                       asset: asset,
-                      thumbhashMode: isScrubbing ? ThumbhashMode.only : ThumbhashMode.enabled,
+                      thumbhashMode: isScrubbing
+                              ? ThumbhashMode.only
+                          : asset != null && asset.hasLocal
+                              ? ThumbhashMode.disabled
+                              : ThumbhashMode.enabled,
                     ),
                   ),
                 ),
                 if (hasStack)
-                  Align(
-                    alignment: Alignment.topRight,
-                    child: Padding(
-                      padding: EdgeInsets.only(right: 10.0, top: asset.isVideo ? 24.0 : 6.0),
-                      child: const _TileOverlayIcon(Icons.burst_mode_rounded),
+                  asset.isVideo
+                      ? const Align(
+                          alignment: Alignment.topRight,
+                          child: Padding(
+                            padding: EdgeInsets.only(
+                              right: 10.0,
+                              top: 24.0,
+                            ),
+                            child: _TileOverlayIcon(Icons.burst_mode_rounded),
+                          ),
+                        )
+                      : const Align(
+                          alignment: Alignment.topRight,
+                          child: Padding(
+                            padding: EdgeInsets.only(
+                              right: 10.0,
+                              top: 6.0,
+                            ),
+                            child: _TileOverlayIcon(Icons.burst_mode_rounded),
                     ),
                   ),
                 if (asset != null && asset.isVideo)