diff --git a/src/libneochat/neochatroom.cpp b/src/libneochat/neochatroom.cpp
index 7a0a7a76c..c88dafbd0 100644
--- a/src/libneochat/neochatroom.cpp
+++ b/src/libneochat/neochatroom.cpp
@@ -1657,6 +1657,12 @@ void NeoChatRoom::downloadEventFromServer(const QString &eventId)
                 }
 
                 event_ptr_tt<RoomEvent> event = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
+                if (auto encEv = eventCast<EncryptedEvent>(event.get())) {
+                    auto decryptedEvent = decryptMessage(*encEv);
+                    if (decryptedEvent) {
+                        event = std::move(decryptedEvent);
+                    }
+                }
                 m_extraEvents.push_back(std::move(event));
                 Q_EMIT extraEventLoaded(eventId);
             },