diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index 6f5234834..00e7dbf6f 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -831,9 +831,9 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             Q_ASSERT(encrypted);
             return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId());
         }
+#endif
+#endif
         return false;
-#endif
-#endif
     }
 
     if (role == DisplayNameForInitialsRole) {
diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml
index 0331651d3..e6d496f50 100644
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -461,7 +461,7 @@ Kirigami.ScrollablePage {
                     source: "security-high"
                     width: height
                     height: parent.height
-                    visible: hoverActions.event.verified
+                    visible: hoverActions.event ? hoverActions.event.verified : false
                     HoverHandler {
                         id: hover
                     }