diff --git a/imports/NeoChat/Component/ChatTextInput.qml b/imports/NeoChat/Component/ChatTextInput.qml
index 7aa38a2c5..9b50c3762 100644
--- a/imports/NeoChat/Component/ChatTextInput.qml
+++ b/imports/NeoChat/Component/ChatTextInput.qml
@@ -89,7 +89,7 @@ ToolBar {
                         Layout.preferredWidth: Kirigami.Units.gridUnit
                         Layout.preferredHeight: Kirigami.Units.gridUnit
 
-                        source: replyUser ? "image://mxc/" + replyUser.avatarMediaId: ""
+                        source: replyUser ? ("image://mxc/" + replyUser.avatarMediaId) : ""
                         name: replyUser ? replyUser.displayName : i18n("No name")
                     }
 
@@ -156,7 +156,7 @@ ToolBar {
                     Kirigami.Avatar {
                         Layout.preferredWidth: Kirigami.Units.gridUnit
                         Layout.preferredHeight: Kirigami.Units.gridUnit
-                        source: modelData.avatarMediaId ? "image://mxc/" + modelData.avatarMediaId : ""
+                        source: modelData.avatarMediaId ? ("image://mxc/" + modelData.avatarMediaId) : ""
                         color: modelData.color ? Qt.darker(modelData.color, 1.1) : null
                         visible: !isEmoji
                     }
diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 2bd539285..de33683d8 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -52,7 +52,7 @@ RowLayout {
 
         visible: showAuthor && Config.showAvatarInTimeline
         name: author.displayName
-        source: author.avatarMediaId ? "image://mxc/" + author.avatarMediaId : ""
+        source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
         color: author.color
 
         Component {
diff --git a/imports/NeoChat/Component/Timeline/ReplyComponent.qml b/imports/NeoChat/Component/Timeline/ReplyComponent.qml
index f047c4a02..5e37af492 100644
--- a/imports/NeoChat/Component/Timeline/ReplyComponent.qml
+++ b/imports/NeoChat/Component/Timeline/ReplyComponent.qml
@@ -30,7 +30,7 @@ QQC2.AbstractButton {
             Layout.preferredHeight: Kirigami.Units.gridUnit
             Layout.alignment: Qt.AlignTop
             visible: Config.showAvatarInTimeline
-            source: replyVisible && reply.author.avatarMediaId ? "image://mxc/" + reply.author.avatarMediaId : ""
+            source: replyVisible && reply.author.avatarMediaId ? ("image://mxc/" + reply.author.avatarMediaId) : ""
             name: replyVisible ? reply.author.displayName : "H"
             color: replyVisible ? reply.author.color : Kirigami.Theme.highlightColor
         }
diff --git a/imports/NeoChat/Component/Timeline/StateDelegate.qml b/imports/NeoChat/Component/Timeline/StateDelegate.qml
index 4294a06f1..a88a2bbdf 100644
--- a/imports/NeoChat/Component/Timeline/StateDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/StateDelegate.qml
@@ -26,7 +26,7 @@ RowLayout {
         Layout.preferredHeight: Kirigami.Units.iconSizes.small
 
         name: author.displayName
-        source: author.avatarMediaId ? "image://mxc/" + author.avatarMediaId : ""
+        source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
         color: author.color
 
         Component {
diff --git a/imports/NeoChat/Dialog/RoomSettingsDialog.qml b/imports/NeoChat/Dialog/RoomSettingsDialog.qml
index 140979b40..fd95626a9 100644
--- a/imports/NeoChat/Dialog/RoomSettingsDialog.qml
+++ b/imports/NeoChat/Dialog/RoomSettingsDialog.qml
@@ -43,7 +43,7 @@ Kirigami.OverlaySheet {
                 Layout.alignment: Qt.AlignTop
 
                 name: room.displayName
-                source: room.avatarMediaId ? "image://mxc/" + room.avatarMediaId : ""
+                source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
 
                 MouseArea {
                     anchors.fill: parent
diff --git a/imports/NeoChat/Dialog/UserDetailDialog.qml b/imports/NeoChat/Dialog/UserDetailDialog.qml
index 0f57cb8f2..9200016e0 100644
--- a/imports/NeoChat/Dialog/UserDetailDialog.qml
+++ b/imports/NeoChat/Dialog/UserDetailDialog.qml
@@ -51,7 +51,7 @@ Kirigami.OverlaySheet {
                 Layout.preferredHeight: Kirigami.Units.iconSizes.huge
 
                 name: displayName
-                source: avatarMediaId ? "image://mxc/" + avatarMediaId : ""
+                source: avatarMediaId ? ("image://mxc/" + avatarMediaId) : ""
 
                 MouseArea {
                     anchors.fill: parent
diff --git a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
index 611733689..179056e19 100644
--- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
+++ b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
@@ -38,7 +38,7 @@ Kirigami.OverlaySheet {
             spacing: Kirigami.Units.largeSpacing
             Kirigami.Avatar {
                 id: avatar
-                source: author.avatarMediaId ? "image://mxc/" + author.avatarMediaId : ""
+                source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
                 Layout.preferredWidth: Kirigami.Units.gridUnit * 3
                 Layout.preferredHeight: Kirigami.Units.gridUnit * 3
                 Layout.alignment: Qt.AlignTop
diff --git a/imports/NeoChat/Page/InviteUserPage.qml b/imports/NeoChat/Page/InviteUserPage.qml
index cb3c9a131..b9e93b3ba 100644
--- a/imports/NeoChat/Page/InviteUserPage.qml
+++ b/imports/NeoChat/Page/InviteUserPage.qml
@@ -86,7 +86,7 @@ Kirigami.ScrollablePage {
                     Layout.preferredWidth: height
                     Layout.fillHeight: true
 
-                    source: avatar ? "image://mxc/" + avatar : ""
+                    source: avatar ? ("image://mxc/" + avatar) : ""
                     name: name
                 }
 
diff --git a/imports/NeoChat/Page/JoinRoomPage.qml b/imports/NeoChat/Page/JoinRoomPage.qml
index 3b44393b6..484174f51 100644
--- a/imports/NeoChat/Page/JoinRoomPage.qml
+++ b/imports/NeoChat/Page/JoinRoomPage.qml
@@ -116,7 +116,7 @@ Kirigami.ScrollablePage {
                     Layout.preferredWidth: Kirigami.Units.iconSizes.huge
                     Layout.preferredHeight: Kirigami.Units.iconSizes.huge
 
-                    source: model.avatar ? "image://mxc/" + model.avatar : ""
+                    source: model.avatar ? ("image://mxc/" + model.avatar) : ""
                     name: name
                 }
                 ColumnLayout {
diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml
index 0de6491ed..1f1c6c63b 100644
--- a/imports/NeoChat/Page/RoomListPage.qml
+++ b/imports/NeoChat/Page/RoomListPage.qml
@@ -134,7 +134,7 @@ Kirigami.ScrollablePage {
                     Layout.minimumWidth: size
                     Layout.maximumWidth: size
 
-                    source: avatar ? "image://mxc/" + avatar : ""
+                    source: avatar ? ("image://mxc/" + avatar) : ""
                     name: model.name || i18n("No Name")
                 }
 
diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml
index d7523b69b..6e8ff424d 100644
--- a/imports/NeoChat/Panel/RoomDrawer.qml
+++ b/imports/NeoChat/Panel/RoomDrawer.qml
@@ -111,7 +111,7 @@ Kirigami.OverlayDrawer {
                         Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
 
                         name: room ? room.displayName : i18n("No name")
-                        source: room ? "image://mxc/" +  room.avatarMediaId : undefined
+                        source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
                     }
 
                     ColumnLayout {
@@ -190,7 +190,7 @@ Kirigami.OverlayDrawer {
                             Layout.preferredWidth: height
                             Layout.fillHeight: true
 
-                            source: "image://mxc/" + avatar
+                            source: avatar ? ("image://mxc/" + avatar) : ""
                             name: name
                         }