diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 0bbb43cf..da15bdfe 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -48,8 +48,8 @@ Item {
         smooth: true
         mipmap: true
 
-        sourceSize.width: Math.min(Screen.desktopAvailableWidth, originalWidth || undefined) * Screen.devicePixelRatio
-        sourceSize.height: Math.min(Screen.desktopAvailableHeight, originalWidth*proportionalHeight || undefined) * Screen.devicePixelRatio
+        sourceSize.width: Math.min(Screen.desktopAvailableWidth, originalWidth < 1 ? Screen.desktopAvailableWidth : originalWidth) * Screen.devicePixelRatio
+        sourceSize.height: Math.min(Screen.desktopAvailableHeight, (originalWidth < 1 ? Screen.desktopAvailableHeight : originalWidth*proportionalHeight)) * Screen.devicePixelRatio
     }
 
     MxcAnimatedImage {
diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp
index 7ba8df44..6df5cd43 100644
--- a/src/MxcImageProvider.cpp
+++ b/src/MxcImageProvider.cpp
@@ -30,6 +30,9 @@ MxcImageProvider::requestImageResponse(const QString &id, const QSize &requested
     double radius = 0;
     auto size     = requestedSize;
 
+    if (requestedSize.width() == 0 && requestedSize.height() == 0)
+        size = QSize();
+
     auto queryStart = id.lastIndexOf('?');
     if (queryStart != -1) {
         id_            = id.left(queryStart);