diff --git a/lib/src/client.dart b/lib/src/client.dart
index 15fd29c0..3487a7d3 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -681,7 +681,7 @@ class Client extends MatrixApi {
       identifier: identifier,
       password: password,
       token: token,
-      deviceId: deviceId,
+      deviceId: deviceId ?? deviceID,
       initialDeviceDisplayName: initialDeviceDisplayName,
       // ignore: deprecated_member_use
       user: user,