diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 93b77ad81..175cff69a 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -245,7 +245,8 @@
                 
                 double trustedDevicesPercentage = usersTrustLevelSummary.trustedDevicesProgress.fractionCompleted;
                 
-                if (trustedDevicesPercentage >= 1.0)
+                if (trustedDevicesPercentage >= 1.0
+                    || usersTrustLevelSummary.trustedDevicesProgress.totalUnitCount == 0)
                 {
                     roomEncryptionTrustLevel = RoomEncryptionTrustLevelTrusted;
                 }