diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 64e365c8..e622bb23 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -46,15 +46,6 @@ Item {
         smooth: true
         mipmap: true
 
-        TapHandler {
-            enabled: type == MtxEvent.ImageMessage && img.status == Image.Ready
-            onSingleTapped: {
-                TimelineManager.openImageOverlay(url, room.data.eventId);
-                eventPoint.accepted = true;
-            }
-            gesturePolicy: TapHandler.ReleaseWithinBounds
-        }
-
     }
 
     MxcAnimatedImage {
@@ -67,6 +58,16 @@ Item {
         eventId: parent.eventId
     }
 
+    TapHandler {
+        // TODO(Nico): Replace this with a qml thingy, that also can show animated images
+        enabled: type == MtxEvent.ImageMessage && (img.status == Image.Ready || mxcimage.loaded)
+        onSingleTapped: {
+            TimelineManager.openImageOverlay(url, room.data.eventId);
+            eventPoint.accepted = true;
+        }
+        gesturePolicy: TapHandler.ReleaseWithinBounds
+    }
+
     HoverHandler {
         id: mouseArea
     }