diff --git a/lib/src/client.dart b/lib/src/client.dart
index ba8d7a5a..b305f3ab 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -1219,6 +1219,7 @@ class Client {
 
   Future<void> _updateUserDeviceKeys() async {
     Set<String> trackedUserIds = await _getUserIdsInEncryptedRooms();
+    trackedUserIds.add(this.userID);
     print("We are tracking the devices of these users:");
     print(trackedUserIds);
 
diff --git a/test/client_test.dart b/test/client_test.dart
index a1828f51..d0dafd5f 100644
--- a/test/client_test.dart
+++ b/test/client_test.dart
@@ -160,7 +160,7 @@ void main() {
       expect(presenceCounter, 1);
       expect(accountDataCounter, 3);
       await Future.delayed(Duration(milliseconds: 50));
-      expect(matrix.userDeviceKeys.length, 1);
+      expect(matrix.userDeviceKeys.length, 2);
       expect(matrix.userDeviceKeys["@alice:example.com"].outdated, false);
       expect(matrix.userDeviceKeys["@alice:example.com"].deviceKeys.length, 1);
       expect(
@@ -179,7 +179,7 @@ void main() {
         }
       });
       await Future.delayed(Duration(milliseconds: 50));
-      expect(matrix.userDeviceKeys.length, 1);
+      expect(matrix.userDeviceKeys.length, 2);
       expect(matrix.userDeviceKeys["@alice:example.com"].outdated, true);
 
       matrix.handleSync({