diff --git a/src/main.cpp b/src/main.cpp
index 6a2f8cf81..a984d56e0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -185,8 +185,10 @@ int main(int argc, char *argv[])
     initLogging();
 
 #if Quotient_VERSION_MINOR == 8
+#ifdef Quotient_E2EE_ENABLED
     Connection::setEncryptionDefault(true);
 #endif
+#endif
 
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
diff --git a/src/models/devicesmodel.cpp b/src/models/devicesmodel.cpp
index de34443b0..0d802a303 100644
--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -56,6 +56,7 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
         if (device.deviceId == m_connection->deviceId()) {
             return This;
         }
+#ifdef Quotient_E2EE_ENABLED
         if (!m_connection->isKnownE2eeCapableDevice(m_connection->userId(), device.deviceId)) {
             return Unencrypted;
         }
@@ -64,6 +65,9 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
         } else {
             return Unverified;
         }
+#else
+        return Unverified;
+#endif
     }
     return {};
 }
@@ -147,6 +151,7 @@ void DevicesModel::setConnection(Connection *connection)
     Q_EMIT connectionChanged();
     fetchDevices();
 
+#ifdef Quotient_E2EE_ENABLED
     connect(m_connection, &Connection::sessionVerified, this, [this](const QString &userId, const QString &deviceId) {
         Q_UNUSED(deviceId);
         if (userId == Controller::instance().activeConnection()->userId()) {
@@ -156,6 +161,7 @@ void DevicesModel::setConnection(Connection *connection)
     connect(m_connection, &Connection::finishedQueryingKeys, this, [this]() {
         fetchDevices();
     });
+#endif
 }
 
 #include "moc_devicesmodel.cpp"