diff --git a/lib/src/client.dart b/lib/src/client.dart
index f0a94dc2..5e80ec02 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -743,7 +743,7 @@ class Client extends MatrixApi {
   /// server to answer this.
   Future<bool> userOwnsEncryptionKeys(String userId) async {
     if (userId == userID) return encryptionEnabled;
-    if (_userDeviceKeys.containsKey(userId)) {
+    if (_userDeviceKeys[userId]?.deviceKeys.isNotEmpty ?? false) {
       return true;
     }
     final keys = await queryKeys({userId: []});