diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 4b9f8198b..c33896afd 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -49,6 +49,9 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             return;
         }
         const RoomEvent *lastEvent = messageEvents().rbegin()->get();
+        if(lastEvent->originTimestamp() < QDateTime::currentDateTime().addSecs(-60)) {
+            return;
+        }
         if (lastEvent->isStateEvent()) {
             return;
         }