diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
index 7ec039e320..8a9401d5f0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@@ -48,12 +48,10 @@ data class RoomDetailsState(
     val eventSink: (RoomDetailsEvent) -> Unit
 ) {
     val roomBadges = buildList {
-        if (isEncrypted || isPublic) {
-            if (isEncrypted) {
-                add(RoomBadge.ENCRYPTED)
-            } else {
-                add(RoomBadge.NOT_ENCRYPTED)
-            }
+        if (isEncrypted) {
+            add(RoomBadge.ENCRYPTED)
+        } else {
+            add(RoomBadge.NOT_ENCRYPTED)
         }
         if (isPublic) {
             add(RoomBadge.PUBLIC)
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
index f07b469697..2a3b41b61b 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
@@ -13,12 +13,14 @@ import org.junit.Test
 
 class RoomDetailsStateTest {
     @Test
-    fun `room not public not encrypted should have no badges`() {
+    fun `room not public not encrypted should have not encrypted badge`() {
         val sut = aRoomDetailsState(
             isPublic = false,
             isEncrypted = false,
         )
-        assertThat(sut.roomBadges).isEmpty()
+        assertThat(sut.roomBadges).isEqualTo(
+            persistentListOf(RoomBadge.NOT_ENCRYPTED)
+        )
     }
 
     @Test
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
index a0132efcad..cb1c1afa9e 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1dd220efe1e2b30ebc14e10bb359b97a7be9c9d25c35e339ad74384a18150a2
-size 42675
+oid sha256:6fc7dc287c5da18ee2a7f8fdadf91285f6e9ed7a8328515cbfd6f90b21642794
+size 42190
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png
index e20889197a..42ea2bca5c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c93a5ad4c336ea01f6f17ce17c6c933066c2298c587b3db9bf24eff48c286f4d
-size 44073
+oid sha256:787945a9d09f405aa8ae2efe88b40cf61b07e21b402e6d842723378ff7d0a001
+size 43242