1 files changed, 6 insertions, 1 deletions
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 332a7b09..bc23a6ad 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -194,7 +194,12 @@ ApplicationWindow {
 
                 readOnly: !isTopicEditingAllowed
                 textFormat: isTopicEditingAllowed ? TextEdit.PlainText : TextEdit.RichText
-                text: isTopicEditingAllowed ? roomSettings.plainRoomTopic : roomSettings.roomTopic
+                text: {
+                    if (roomSettings.plainRoomTopic === "")
+                        return qsTr("<i>No topic set</i>")
+                    else
+                        return isTopicEditingAllowed ? roomSettings.plainRoomTopic : roomSettings.roomTopic
+                }
                 wrapMode: TextEdit.WordWrap
                 background: null
                 selectByMouse: !Settings.mobileMode