2 files changed, 4 insertions, 4 deletions
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 1a086c2b..1636bcd1 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -241,7 +241,7 @@ InputBar::updateTextContentProperties(const QString &t, bool charDeleted)
         }
     }
 
-    auto roomMention = containsRoomMention(t);
+    auto roomMention = containsRoomMention(t) && this->room->permissions()->canPingRoom();
 
     if (roomMention != this->containsAtRoom_) {
         if (roomMention)
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 3e3434b4..03606d90 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1162,12 +1162,12 @@ TimelineModel::syncState(const mtx::responses::State &s)
 void
 TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
 {
-    if (timeline.events.empty())
-        return;
-
     if (timeline.limited)
         setPaginationInProgress(false);
 
+    if (timeline.events.empty())
+        return;
+
     events.handleSync(timeline);
 
     using namespace mtx::events;