diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml
index ea03f8902..f4b6db261 100644
--- a/imports/NeoChat/Page/RoomListPage.qml
+++ b/imports/NeoChat/Page/RoomListPage.qml
@@ -116,7 +116,8 @@ Kirigami.ScrollablePage {
             leading: Kirigami.Avatar {
                 source: avatar ? "image://mxc/" + avatar : ""
                 name: model.name || i18n("No Name")
-                implicitWidth: height
+                implicitWidth: visible ? height : 0
+                visible: Config.showAvatarInTimeline
             }
 
             trailing: RowLayout {
diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml
index e6085f49c..110d4cbd9 100644
--- a/imports/NeoChat/Panel/RoomDrawer.qml
+++ b/imports/NeoChat/Panel/RoomDrawer.qml
@@ -197,6 +197,7 @@ Kirigami.OverlayDrawer {
                         Kirigami.Avatar {
                             Layout.preferredWidth: height
                             Layout.fillHeight: true
+                            visible: Config.showAvatarInTimeline
 
                             source: avatar ? ("image://mxc/" + avatar) : ""
                             name: name