diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index bc23a6ad..81235fee 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -194,12 +194,9 @@ ApplicationWindow {
readOnly: !isTopicEditingAllowed
textFormat: isTopicEditingAllowed ? TextEdit.PlainText : TextEdit.RichText
- text: {
- if (roomSettings.plainRoomTopic === "")
- return qsTr("No topic set")
- else
- return isTopicEditingAllowed ? roomSettings.plainRoomTopic : roomSettings.roomTopic
- }
+ text: isTopicEditingAllowed
+ ? roomSettings.plainRoomTopic
+ : (roomSettings.plainRoomTopic === "" ? ("" + qsTr("No topic set") + "") : roomSettings.roomTopic)
wrapMode: TextEdit.WordWrap
background: null
selectByMouse: !Settings.mobileMode