diff --git a/imports/NeoChat/Settings/DevicesPage.qml b/imports/NeoChat/Settings/DevicesPage.qml
index 06183e338..b2a7e4913 100644
--- a/imports/NeoChat/Settings/DevicesPage.qml
+++ b/imports/NeoChat/Settings/DevicesPage.qml
@@ -43,6 +43,7 @@ Kirigami.ScrollablePage {
                 }
                 Controls.ToolButton {
                     display: Controls.AbstractButton.IconOnly
+                    visible: Controller.encryptionSupported
                     action: Kirigami.Action {
                         text: i18n("Verify device")
                         iconName: "security-low-symbolic"
diff --git a/src/main.cpp b/src/main.cpp
index 8bbc9d785..d9959df0e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -232,10 +232,12 @@ int main(int argc, char *argv[])
     qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
     qRegisterMetaType<QMimeType>("QMimeType");
 #ifdef QUOTIENT_07
+#ifdef Quotient_E2EE_ENABLED
     qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
     qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
     qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
 #endif
+#endif
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     qRegisterMetaTypeStreamOperators<Emoji>();
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index 4d8fb1ab3..e006b88e1 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -814,12 +814,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (role == VerifiedRole) {
 #ifdef QUOTIENT_07
+#ifdef Quotient_E2EE_ENABLED
         if (evt.originalEvent()) {
             auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());
             Q_ASSERT(encrypted);
             return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId());
         }
         return false;
+#endif
 #endif
     }