diff --git a/src/qml/TimelineView.qml b/src/qml/TimelineView.qml
index a3179b4d2..04b0657e8 100644
--- a/src/qml/TimelineView.qml
+++ b/src/qml/TimelineView.qml
@@ -191,7 +191,7 @@ QQC2.ScrollView {
             implicitHeight: Kirigami.Units.gridUnit * 2
 
             z: 2
-            visible: root.currentRoom?.hasUnreadMessages || false
+            visible: (root.currentRoom?.hasUnreadMessages ?? false)
 
             text: root.currentRoom.readMarkerLoaded ? i18n("Jump to first unread message") : i18n("Jump to oldest loaded message")
             action: Kirigami.Action {
diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml
index a836b73ba..d7664cf43 100644
--- a/src/timeline/MessageDelegate.qml
+++ b/src/timeline/MessageDelegate.qml
@@ -235,7 +235,7 @@ TimelineDelegate {
                     topMargin: Kirigami.Units.smallSpacing
                 }
 
-                visible: root.contentModel?.showAuthor || false && Config.showAvatarInTimeline && (Config.compactLayout || !_private.showUserMessageOnRight)
+                visible: (root.contentModel?.showAuthor ?? false) && Config.showAvatarInTimeline && (Config.compactLayout || !_private.showUserMessageOnRight)
                 name: root.author.displayName
                 source: root.author.avatarUrl
                 color: root.author.color