diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index c4c143cc..8b347b58 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -59,7 +59,7 @@ Item {
 
         Image {
             anchors.fill: parent
-            source: thumbnailUrl ? thumbnailUrl.replace("mxc://", "image://MxcImage/") + "?scale" : ""
+            source: thumbnailUrl ? thumbnailUrl.replace("mxc://", "image://MxcImage/") + "?scale" : "image://colorimage/:/icons/icons/ui/video-file.svg?" + Nheko.colors.windowText
             asynchronous: true
             fillMode: Image.PreserveAspectFit
 
diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp
index 46d7430f..da5a2231 100644
--- a/src/ui/MxcMediaProxy.cpp
+++ b/src/ui/MxcMediaProxy.cpp
@@ -21,10 +21,12 @@
 #include <QTemporaryFile>
 #endif
 
+#include "ChatPage.h"
 #include "EventAccessors.h"
 #include "Logging.h"
 #include "MatrixClient.h"
 #include "timeline/TimelineModel.h"
+#include "timeline/TimelineViewManager.h"
 
 MxcMediaProxy::MxcMediaProxy(QObject *parent)
   : QMediaPlayer(parent)
@@ -47,6 +49,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
                 if (t == QMediaMetaData::Orientation)
                     emit orientationChanged();
             });
+
+    connect(ChatPage::instance()->timelineManager()->rooms(),
+            &RoomlistModel::currentRoomChanged,
+            this,
+            &MxcMediaProxy::pause);
 }
 void
 MxcMediaProxy::setVideoSurface(QAbstractVideoSurface *surface)