diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 9a1c9ca..0bdf05b 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -911,6 +911,11 @@ export default {
             this.events = this.timelineWindow.getEvents();
             this.initialLoadDone = true;
           }
+        })
+        .finally(() => {
+          for (var event of this.events) {
+            this.$matrix.matrixClient.decryptEventIfNeeded(event, {});
+          }
         });
     },
 
@@ -1170,6 +1175,8 @@ export default {
         return; // Not for this room
       }
 
+      this.$matrix.matrixClient.decryptEventIfNeeded(event, {});
+
       if (this.initialLoadDone) {
         this.paginateBackIfNeeded();
       }