diff --git a/src/domain/session/room/timeline/tiles/ImageTile.js b/src/domain/session/room/timeline/tiles/ImageTile.js
index 4cab3b87..bb9fb5d4 100644
--- a/src/domain/session/room/timeline/tiles/ImageTile.js
+++ b/src/domain/session/room/timeline/tiles/ImageTile.js
@@ -27,12 +27,18 @@ export class ImageTile extends MessageTile {
 
     get thumbnailUrl() {
         const mxcUrl = this._getContent().url;
-        return this._room.mxcUrlThumbnail(mxcUrl, this.thumbnailWidth, this.thumbnailHeight, "scale");
+        if (mxcUrl) {
+            return this._room.mxcUrlThumbnail(mxcUrl, this.thumbnailWidth, this.thumbnailHeight, "scale");
+        }
+        return null;
     }
 
     get url() {
         const mxcUrl = this._getContent().url;
-        return this._room.mxcUrl(mxcUrl);   
+        if (mxcUrl) {
+            return this._room.mxcUrl(mxcUrl);
+        }
+        return null;
     }
 
     _scaleFactor() {