diff --git a/src/timeline/models/timelinemodel.cpp b/src/timeline/models/timelinemodel.cpp
index 26fe91a87..565bc2e46 100644
--- a/src/timeline/models/timelinemodel.cpp
+++ b/src/timeline/models/timelinemodel.cpp
@@ -79,10 +79,8 @@ void TimelineBeginningModel::setRoom(NeoChatRoom *room)
     if (m_room != nullptr) {
         Quotient::connectUntil(m_room.get(), &Quotient::Room::eventsHistoryJobChanged, this, [this]() {
             if (m_room && m_room->allHistoryLoaded()) {
-                // HACK: We have to do it this way because DelegateChooser doesn't update dynamically.
-                beginRemoveRows({}, 0, 0);
-                endRemoveRows();
-                beginInsertRows({}, 0, 0);
+                Q_EMIT dataChanged(index(0, 0), index(0, 0), {DelegateTypeRole});
+                beginInsertRows({}, 1, 1);
                 endInsertRows();
                 return true;
             }