diff --git a/keyserver/api/api.go b/keyserver/api/api.go
index d1e93e1f7..5cb287bc1 100644
--- a/keyserver/api/api.go
+++ b/keyserver/api/api.go
@@ -108,8 +108,8 @@ type OneTimeKeysCount struct {
 
 // PerformUploadKeysRequest is the request to PerformUploadKeys
 type PerformUploadKeysRequest struct {
-	UserID      string // User performing the request
-	DeviceID    string // Device performing the request
+	UserID      string // Required - User performing the request
+	DeviceID    string // Optional - Device performing the request, for fetching OTK count
 	DeviceKeys  []DeviceKeys
 	OneTimeKeys []OneTimeKeys
 	// OnlyDisplayNameUpdates should be `true` if ALL the DeviceKeys are present to update
diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index dce8b5051..4abf908d4 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -218,6 +218,7 @@ func (a *UserInternalAPI) PerformDeviceUpdate(ctx context.Context, req *api.Perf
 		// display name has changed: update the device key
 		var uploadRes keyapi.PerformUploadKeysResponse
 		a.KeyAPI.PerformUploadKeys(context.Background(), &keyapi.PerformUploadKeysRequest{
+			UserID: req.RequestingUserID,
 			DeviceKeys: []keyapi.DeviceKeys{
 				{
 					DeviceID:    dev.ID,