diff --git a/clientapi/routing/key_backup.go b/clientapi/routing/key_backup.go
index 71ac95a3..9d2ff87f 100644
--- a/clientapi/routing/key_backup.go
+++ b/clientapi/routing/key_backup.go
@@ -201,7 +201,7 @@ func UploadBackupKeys(
 		UserID:  device.UserID,
 		Version: version,
 		Keys:    *keys,
-	}, &performKeyBackupResp); err != nil {
+	}, &performKeyBackupResp); err != nil && performKeyBackupResp.Error == "" {
 		return jsonerror.InternalServerError()
 	}
 	if performKeyBackupResp.Error != "" {