diff --git a/database/entities/User.ts b/database/entities/User.ts
index 1566a184..eb97303a 100644
--- a/database/entities/User.ts
+++ b/database/entities/User.ts
@@ -71,6 +71,17 @@ export const followRequestUser = async (
 ) => {
     const isRemote = follower.instanceId !== followee.instanceId;
 
+    const relationship = await client.relationship.update({
+        where: { id: relationshipId },
+        data: {
+            following: isRemote ? false : !followee.isLocked,
+            requested: isRemote ? true : followee.isLocked,
+            showingReblogs: reblogs,
+            notifying: notify,
+            languages: languages,
+        },
+    });
+
     if (isRemote) {
         // Federate
         // TODO: Make database job
@@ -85,9 +96,17 @@ export const followRequestUser = async (
 
         if (!response.ok) {
             console.error(await response.text());
-            throw new Error(
+            console.error(
                 `Failed to federate follow request from ${follower.id} to ${followee.uri}`,
             );
+
+            return await client.relationship.update({
+                where: { id: relationshipId },
+                data: {
+                    following: false,
+                    requested: false,
+                },
+            });
         }
     } else {
         if (followee.isLocked) {
@@ -109,17 +128,6 @@ export const followRequestUser = async (
         }
     }
 
-    const relationship = await client.relationship.update({
-        where: { id: relationshipId },
-        data: {
-            following: isRemote ? false : !followee.isLocked,
-            requested: isRemote ? true : followee.isLocked,
-            showingReblogs: reblogs,
-            notifying: notify,
-            languages: languages,
-        },
-    });
-
     return relationship;
 };