diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
index 40e5e38ee..94ee3fa09 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -329,7 +329,8 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
     if (isRedacted)
     {
         // Check whether the event is a thread root or redacted information is required
-        if ([mxSession.threadingService isEventThreadRoot:event] || _settings.showRedactionsInRoomHistory)
+        if ((RiotSettings.shared.enableThreads && [mxSession.threadingService isEventThreadRoot:event])
+            || _settings.showRedactionsInRoomHistory)
         {
             MXLogDebug(@"[MXKEventFormatter] Redacted event %@ (%@)", event.description, event.redactedBecause);
             
diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index f30939e67..efb79d40e 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -68,7 +68,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
     if (event.isRedactedEvent)
     {
         // Check whether the event is a thread root or redacted information is required
-        if ([mxSession.threadingService isEventThreadRoot:event]
+        if ((RiotSettings.shared.enableThreads && [mxSession.threadingService isEventThreadRoot:event])
             || self.settings.showRedactionsInRoomHistory)
         {
             UIFont *font = self.defaultTextFont;