diff --git a/CHANGES.rst b/CHANGES.rst
index fc3ef67ee..9c35864b1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ Changes to be released in next version
 
 🙌 Improvements
  * Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint (#4120).
+ * Room lists: Remove shields on room avatars (#4115).
 
 🐛 Bugfix
  * 
diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
index f8284c868..57fdb56a9 100644
--- a/Config/CommonConfiguration.swift
+++ b/Config/CommonConfiguration.swift
@@ -59,7 +59,6 @@ class CommonConfiguration: NSObject, Configurable {
         
         // Enable e2e encryption for newly created MXSession
         sdkOptions.enableCryptoWhenStartingMXSession = true
-        sdkOptions.computeE2ERoomSummaryTrust = true
         
         // Disable identicon use
         sdkOptions.disableIdenticonUseForUserAvatar = true
diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
index b8a4aae9a..75ad54f6f 100644
--- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
+++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -141,15 +141,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
         
         self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
 
-        if (roomCellData.roomSummary.isEncrypted)
-        {
-            self.encryptedRoomIcon.hidden = NO;
-            self.encryptedRoomIcon.image = [self shieldImageForTrustLevel:roomCellData.roomSummary.roomEncryptionTrustLevel];
-        }
-        else
-        {
-            self.encryptedRoomIcon.hidden = YES;
-        }
+        self.encryptedRoomIcon.hidden = YES;
 
         [roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar];
     }
@@ -165,32 +157,4 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
     return 74;
 }
 
-- (UIImage*)shieldImageForTrustLevel:(RoomEncryptionTrustLevel)roomEncryptionTrustLevel
-{
-    UIImage *shieldImage;
-    
-    NSString *encryptionIconName;
-    switch (roomEncryptionTrustLevel)
-    {
-        case RoomEncryptionTrustLevelWarning:
-            encryptionIconName = @"encryption_warning";
-            break;
-        case RoomEncryptionTrustLevelNormal:
-            encryptionIconName = @"encryption_normal";
-            break;
-        case RoomEncryptionTrustLevelTrusted:
-            encryptionIconName = @"encryption_trusted";
-            break;
-        case RoomEncryptionTrustLevelUnknown:
-            encryptionIconName = @"encryption_normal";
-            break;
-    }
-    
-    if (encryptionIconName)
-    {
-        shieldImage = [UIImage imageNamed:encryptionIconName];
-    }
-    return shieldImage;
-}
-
 @end
diff --git a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
index f715c5391..81d51cb33 100644
--- a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
+++ b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
@@ -66,8 +66,6 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
     self.titleLabel.text = room.summary.displayname;
     
     self.directRoomBorderView.hidden = !room.isDirect;
-    
-    self.encryptedRoomIcon.hidden = !room.summary.isEncrypted;
 }
 
 - (void)prepareForReuse
@@ -75,7 +73,6 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
     [super prepareForReuse];
     
     self.directRoomBorderView.hidden = YES;
-    self.encryptedRoomIcon.hidden = YES;
 }
 
 + (CGFloat)cellHeight
diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.m b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
index 203b80530..698e2dd6a 100644
--- a/Riot/Modules/Home/Views/RoomCollectionViewCell.m
+++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
@@ -146,16 +146,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
         }
         
         self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
-        
-        if (roomCellData.roomSummary.isEncrypted)
-        {
-            self.encryptedRoomIcon.hidden = NO;
-            self.encryptedRoomIcon.image = [EncryptionTrustLevelBadgeImageHelper roomBadgeImageFor:roomCellData.roomSummary.roomEncryptionTrustLevel];
-        }
-        else
-        {
-            self.encryptedRoomIcon.hidden = YES;
-        }
+        self.encryptedRoomIcon.hidden = YES;
         
         [roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar];
     }
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 520dcac6d..a4948e0f8 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -120,6 +120,8 @@
 
     if (self.room.summary.isEncrypted)
     {
+        // Make sure we have the trust shield value
+        [self.room.summary enableTrustTracking:YES];
         [self fetchEncryptionTrustedLevel];
     }
 }
diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
index 48db29100..c6c81052a 100644
--- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
+++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
@@ -70,16 +70,7 @@
         }  
         
         self.directRoomBorderView.hidden = !roomCellData.roomSummary.isDirect;
-        
-        if (roomCellData.roomSummary.isEncrypted)
-        {
-            self.encryptedRoomIcon.hidden = NO;
-            self.encryptedRoomIcon.image = [self shieldImageForTrustLevel:roomCellData.roomSummary.roomEncryptionTrustLevel];
-        }
-        else
-        {
-            self.encryptedRoomIcon.hidden = YES;
-        }
+        self.encryptedRoomIcon.hidden = YES;
     }
 }
 
@@ -88,32 +79,4 @@
     return 74;
 }
 
-- (UIImage*)shieldImageForTrustLevel:(RoomEncryptionTrustLevel)roomEncryptionTrustLevel
-{
-    UIImage *shieldImage;
-    
-    NSString *encryptionIconName;
-    switch (roomEncryptionTrustLevel)
-    {
-        case RoomEncryptionTrustLevelWarning:
-            encryptionIconName = @"encryption_warning";
-            break;
-        case RoomEncryptionTrustLevelNormal:
-            encryptionIconName = @"encryption_normal";
-            break;
-        case RoomEncryptionTrustLevelTrusted:
-            encryptionIconName = @"encryption_trusted";
-            break;
-        case RoomEncryptionTrustLevelUnknown:
-            encryptionIconName = @"encryption_normal";
-            break;
-    }
-    
-    if (encryptionIconName)
-    {
-        shieldImage = [UIImage imageNamed:encryptionIconName];
-    }
-    return shieldImage;
-}
-
 @end