diff --git a/Riot/Modules/Analytics/DecryptionFailureTracker.m b/Riot/Modules/Analytics/DecryptionFailureTracker.m
index 7161b02ef..f66a61006 100644
--- a/Riot/Modules/Analytics/DecryptionFailureTracker.m
+++ b/Riot/Modules/Analytics/DecryptionFailureTracker.m
@@ -159,7 +159,7 @@ NSString *const kDecryptionFailureTrackerAnalyticsCategory = @"e2e.failure";
         for (DecryptionFailure *failure in failuresToTrack)
         {
             if ( failure.reason == DecryptionFailureReasonUnspecified) {
-                [BWIAnalytics.sharedTracker trackE2EEError:failure.errorCode context:failure.context];
+                [BWIAnalytics.sharedTracker trackE2EEError:failure.errorCode];
             } else {
                 failuresCounts[@(failure.reason)] = @(failuresCounts[@(failure.reason)].unsignedIntegerValue + 1);
             }
diff --git a/bwi/MatomoAnalytics/BWIAnalytics.swift b/bwi/MatomoAnalytics/BWIAnalytics.swift
index 4b64ca0c6..2cb973d36 100644
--- a/bwi/MatomoAnalytics/BWIAnalytics.swift
+++ b/bwi/MatomoAnalytics/BWIAnalytics.swift
@@ -225,8 +225,8 @@ extension BWIAnalytics : MXAnalyticsDelegate {
         // dont track NV specific logs
     }
     
-    func trackE2EEError(_ reason: DecryptionFailureReason, context: String) {
-        if let errorCode = AnalyticsE2EEErrorCode(rawValue: reason.rawValue) {
+    func trackE2EEError(_ errorCode: Int) {
+        if let errorCode = AnalyticsE2EEErrorCode(rawValue: errorCode) {
             self.trackBwiValue(NSNumber(value: 1), "Encryption", "SendMessage", errorCode.description)
         } else {
             self.trackBwiValue(NSNumber(value: 1), "Encryption", "SendMessage", "Unknown_Error")
@@ -235,10 +235,13 @@ extension BWIAnalytics : MXAnalyticsDelegate {
     }
     
     func trackE2EEErrors(_ reason: DecryptionFailureReason, count: Int) {
-        if let errorCode = AnalyticsE2EEErrorCode(rawValue: reason.rawValue) {
-            self.trackBwiValue(NSNumber(value: count), "Encryption", "SendMessage", errorCode.description)
-        } else {
+        switch reason {
+        case .unspecified:
             self.trackBwiValue(NSNumber(value: count), "Encryption", "SendMessage", "Unknown_Error")
+        case .olmIndexError:
+            self.trackBwiValue(NSNumber(value: count), "Encryption", "SendMessage", AnalyticsE2EEErrorCode(rawValue: 3)!.description)
+        case .olmKeysNotSent:
+            self.trackBwiValue(NSNumber(value: count), "Encryption", "SendMessage", AnalyticsE2EEErrorCode(rawValue: 4)!.description)
         }
     }
 }