diff --git a/src/timeline2/TimelineModel.h b/src/timeline2/TimelineModel.h
index 3af94643bcdc50e76fb4b7c46019c2500fc9e3f1..51cb9be39997069376512dd703773168a79b662b 100644
--- a/src/timeline2/TimelineModel.h
+++ b/src/timeline2/TimelineModel.h
@@ -112,9 +112,8 @@ private:
         QString room_id_;
         QString prev_batch_token_;
 
-        bool isInitialSync = true;
+        bool isInitialSync        = true;
         bool paginationInProgress = false;
 
         QHash<QString, QColor> userColors;
 };
-
diff --git a/src/timeline2/TimelineViewManager.cpp b/src/timeline2/TimelineViewManager.cpp
index df9a22702b804e59c231fdac214fea49e2a6b0a0..0e0e74e47952d624cd840adbf22f805b563b2c5b 100644
--- a/src/timeline2/TimelineViewManager.cpp
+++ b/src/timeline2/TimelineViewManager.cpp
@@ -44,7 +44,7 @@ TimelineViewManager::setHistoryView(const QString &room_id)
 
         auto room = models.find(room_id);
         if (room != models.end()) {
-                timeline_ = room.value().get();
+                timeline_ = room.value().data();
                 timeline_->fetchHistory();
                 emit activeTimelineChanged(timeline_);
                 nhlog::ui()->info("Activated room {}", room_id.toStdString());
diff --git a/src/timeline2/TimelineViewManager.h b/src/timeline2/TimelineViewManager.h
index ff976aad889965303e618ac00ecd9ac7d64f11b3..1bec874609de92730980422e2d63611629af3173 100644
--- a/src/timeline2/TimelineViewManager.h
+++ b/src/timeline2/TimelineViewManager.h
@@ -32,10 +32,7 @@ public:
         void sync(const mtx::responses::Rooms &rooms) {}
         void clearAll() { models.clear(); }
 
-        Q_INVOKABLE TimelineModel *activeTimeline() const
-        {
-                return timeline_;
-        }
+        Q_INVOKABLE TimelineModel *activeTimeline() const { return timeline_; }
 
 signals:
         void clearRoomMessageCount(QString roomid);