diff --git a/src/Identity/IdentityServer/BaseRequestValidator.cs b/src/Identity/IdentityServer/BaseRequestValidator.cs
index cc7cab59a6..f5cdb9ebb2 100644
--- a/src/Identity/IdentityServer/BaseRequestValidator.cs
+++ b/src/Identity/IdentityServer/BaseRequestValidator.cs
@@ -562,6 +562,10 @@ public abstract class BaseRequestValidator<T> where T : class
                     }
                 }
             }
+            else
+            {
+                deviceFromRequest.Id = existingDevice.Id;
+            }
 
             deviceFromRequest.UserId = user.Id;
             await _deviceService.SaveAsync(deviceFromRequest);