diff --git a/clientapi/routing/keys.go b/clientapi/routing/keys.go
index ba03a352f..e22336428 100644
--- a/clientapi/routing/keys.go
+++ b/clientapi/routing/keys.go
@@ -38,7 +38,10 @@ func UploadKeys(req *http.Request, keyAPI api.KeyInternalAPI, device *userapi.De
 		return *resErr
 	}
 
-	uploadReq := &api.PerformUploadKeysRequest{}
+	uploadReq := &api.PerformUploadKeysRequest{
+		DeviceID: device.ID,
+		UserID:   device.UserID,
+	}
 	if r.DeviceKeys != nil {
 		uploadReq.DeviceKeys = []api.DeviceKeys{
 			{
diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go
index 3305043f0..beb165f4e 100644
--- a/keyserver/internal/internal.go
+++ b/keyserver/internal/internal.go
@@ -520,7 +520,9 @@ func (a *KeyInternalAPI) uploadOneTimeKeys(ctx context.Context, req *api.Perform
 				Err: fmt.Sprintf("a.DB.OneTimeKeysCount: %s", err),
 			}
 		}
-		res.OneTimeKeyCounts = append(res.OneTimeKeyCounts, *counts)
+		if counts != nil {
+			res.OneTimeKeyCounts = append(res.OneTimeKeyCounts, *counts)
+		}
 		return
 	}
 	for _, key := range req.OneTimeKeys {