2 files changed, 7 insertions, 3 deletions

diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 14dd1b9b9..f802658cf 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -177,7 +177,7 @@ async function updateActorAvatarInstance (actor: MActorDefault, info: AvatarInfo
 
   if (actor.Avatar) {
     // Don't update the avatar if the filename did not change
-    if (actor.Avatar.filename === info.name) return actor
+    if (actor.Avatar.fileUrl === info.fileUrl) return actor
 
     try {
       await actor.Avatar.destroy({ transaction: t })
diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts
index 39b9fecc0..b6b33a884 100644
--- a/server/tests/api/server/reverse-proxy.ts
+++ b/server/tests/api/server/reverse-proxy.ts
@@ -103,8 +103,12 @@ describe('Test application behind a reverse proxy', function () {
   })
 
   it('Should rate limit signup', async function () {
-    for (let i = 0; i < 3; i++) {
-      await registerUser(server.url, 'test' + i, 'password')
+    for (let i = 0; i < 10; i++) {
+      try {
+        await registerUser(server.url, 'test' + i, 'password')
+      } catch {
+        // empty
+      }
     }
 
     await registerUser(server.url, 'test42', 'password', 429)