diff --git a/autotests/modeltest.cpp b/autotests/modeltest.cpp
index 06eeb7365..c42c5988e 100644
--- a/autotests/modeltest.cpp
+++ b/autotests/modeltest.cpp
@@ -399,12 +399,7 @@ void ModelTest::testCompletionModel()
     tester->setUseFetchMore(true);
     model->setRoom(room);
     model->setAutoCompletionType(CompletionModel::Room);
-<<<<<<< HEAD
-    model->setText(u"foo"_s, u"#foo"_s);
     auto roomListModel = new RoomListModel(this);
-=======
-    auto roomListModel = new RoomListModel();
->>>>>>> da60b8068 (Fix merge issues)
     roomListModel->setConnection(connection);
     model->setRoomListModel(roomListModel);
 }
diff --git a/src/messagecontent/models/chatbarmessagecontentmodel.cpp b/src/messagecontent/models/chatbarmessagecontentmodel.cpp
index 9b04c6846..0e24ec76e 100644
--- a/src/messagecontent/models/chatbarmessagecontentmodel.cpp
+++ b/src/messagecontent/models/chatbarmessagecontentmodel.cpp
@@ -43,12 +43,14 @@ ChatBarMessageContentModel::ChatBarMessageContentModel(QObject *parent)
             addAttachment(QUrl(m_room->cacheForType(m_type)->attachmentPath()));
         }
 
+        clearModel();
+
         const auto textSections = m_room->cacheForType(m_type)->text().split(u"\n\n"_s);
         if (textSections.length() == 1 && textSections[0].isEmpty()) {
+            initializeModel();
             return;
         }
 
-        clearModel();
         beginResetModel();
         for (const auto &section : textSections) {
             const auto type = MessageComponentType::typeForString(section);