diff --git a/ruma-client-api/CHANGELOG.md b/ruma-client-api/CHANGELOG.md
index b87daadb..3a4c954f 100644
--- a/ruma-client-api/CHANGELOG.md
+++ b/ruma-client-api/CHANGELOG.md
@@ -20,6 +20,7 @@ Breaking changes:
 * Fix event types in `r0::sync::sync_events`
 * Update type of `user_id` in `r0::account::whoami` from `String` to `ruma_identifiers::UserId`
 * Update type of `limited` in `r0::sync::sync_events::Timeline` from `Option<bool>` to `bool`
+* Use `DeviceId` for `device_id` field of `r0::session::login::Response`
 
 Improvements:
 
diff --git a/ruma-client-api/src/r0/session/login.rs b/ruma-client-api/src/r0/session/login.rs
index 3d972b89..f1fa64d4 100644
--- a/ruma-client-api/src/r0/session/login.rs
+++ b/ruma-client-api/src/r0/session/login.rs
@@ -51,9 +51,9 @@ ruma_api! {
 
         /// ID of the logged-in device.
         ///
-        /// Will be the same as the corresponging parameter in the request, if one was
+        /// Will be the same as the corresponding parameter in the request, if one was
         /// specified.
-        pub device_id: String,
+        pub device_id: DeviceId,
 
         /// Client configuration provided by the server.
         ///