diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 9015bafa..5a8b5381 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -84,17 +84,12 @@ Item {
                         target: timelineView
                     }
 
-                    Loader {
-                        active: room || roomPreview
-                        asynchronous: false
-                        Layout.fillWidth: true
 
-                        sourceComponent: MessageView {
+                        MessageView {
                             implicitHeight: msgView.height - typingIndicator.height
+                            Layout.fillWidth: true
                         }
 
-                    }
-
                     Loader {
                         source: CallManager.isOnCall && CallManager.callType != CallType.VOICE ? "voip/VideoCall.qml" : ""
                         onLoaded: TimelineManager.setVideoCallItem()