diff --git a/CHANGES.rst b/CHANGES.rst
index 2325bbf06..cf2db8d5b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ Changes to be released in next version
  * 
 
 🙌 Improvements
- * 
+ * Crypto: Do not decrypt synchronously. It asynchronously happens upstream now (#4306). 
 
 🐛 Bugfix
  * buildRelease.sh: Make bundler operations in the cloned repository folder.
diff --git a/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift b/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
index 7885393dc..1a1b0aede 100644
--- a/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
+++ b/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
@@ -220,12 +220,6 @@ final class EditHistoryViewModel: EditHistoryViewModelType {
     }
 
     private func process(event: MXEvent, ts: UInt64) -> EditHistoryMessage? {
-        
-        if event.isEncrypted && event.clear == nil {
-            if self.session.decryptEvent(event, inTimeline: nil) == false {
-                print("[EditHistoryViewModel] processEditEvent: Fail to decrypt event: \(event.eventId ?? "")")
-            }
-        }
 
         let formatterError = UnsafeMutablePointer<MXKEventFormatterError>.allocate(capacity: 1)
         guard let message = self.formatter.attributedString(from: event, with: nil, error: formatterError) else {