diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt
index 5b489183..0728ad56 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -76,8 +76,9 @@ class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
             val args = intent.getParcelableExtra<RoomPreviewData>(ARG)
 
             if (args.worldReadable) {
-                // TODO Room preview
-                notImplemented("Room preview of world readable room")
+                // TODO Room preview: Note: M does not recommend to use /events anymore, so for now we just display the room preview
+                // TODO the same way if it was not world readable
+                addFragment(RoomPreviewNoPreviewFragment.newInstance(args), R.id.simpleFragmentContainer)
             } else {
                 addFragment(RoomPreviewNoPreviewFragment.newInstance(args), R.id.simpleFragmentContainer)
             }
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
index abfd2472..efb881fc 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
@@ -36,6 +36,9 @@ import org.koin.android.ext.android.get
 import org.koin.android.scope.ext.android.bindScope
 import org.koin.android.scope.ext.android.getOrCreateScope
 
+/**
+ * Note: this Fragment is also used for world readable room for the moment
+ */
 class RoomPreviewNoPreviewFragment : VectorBaseFragment() {
 
     companion object {
@@ -64,6 +67,12 @@ class RoomPreviewNoPreviewFragment : VectorBaseFragment() {
         roomPreviewNoPreviewName.text = roomPreviewData.roomName
         roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic)
 
+        if (roomPreviewData.worldReadable) {
+            roomPreviewNoPreviewLabel.setText(R.string.room_preview_world_readable_room_not_supported_yet)
+        } else {
+            roomPreviewNoPreviewLabel.setText(R.string.room_preview_no_preview)
+        }
+
         roomPreviewNoPreviewJoin.callback = object : ButtonStateView.Callback {
             override fun onButtonClicked() {
                 roomPreviewViewModel.joinRoom()
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 4cb9d375..948d65b9 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -62,9 +62,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
-                    android:text="@string/room_preview_no_preview"
+                    android:gravity="center"
                     android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    tools:text="@string/room_preview_no_preview" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewError"
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 299b34f6..be190cde 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -35,5 +35,6 @@
     <string name="group_all_communities">"All Communities"</string>
 
     <string name="room_preview_no_preview">"This room can't be previewed"</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">"The preview of world-readable room is not supported yet in RiotX"</string>
 
 </resources>
\ No newline at end of file