diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py
index cf7d08ebc..b2140c21b 100644
--- a/api/funkwhale_api/federation/tasks.py
+++ b/api/funkwhale_api/federation/tasks.py
@@ -206,7 +206,7 @@ def update_domain_nodeinfo(domain):
         domain.service_actor = (
             utils.retrieve_ap_object(
                 service_actor_id,
-                actor=actors.get_service_actor(),
+                actor=None,
                 queryset=models.Actor,
                 serializer_class=serializers.ActorSerializer,
             )
diff --git a/api/funkwhale_api/federation/utils.py b/api/funkwhale_api/federation/utils.py
index 2bac8daf8..9dce78246 100644
--- a/api/funkwhale_api/federation/utils.py
+++ b/api/funkwhale_api/federation/utils.py
@@ -67,7 +67,11 @@ def slugify_username(username):
 
 
 def retrieve_ap_object(
-    fid, actor, serializer_class=None, queryset=None, apply_instance_policies=True
+    fid,
+    actor,
+    serializer_class=None,
+    queryset=None,
+    apply_instance_policies=True,
 ):
     # we have a duplicate check here because it's less expensive to do those checks
     # twice than to trigger a HTTP request
diff --git a/changes/changelog.d/1714.bugfix b/changes/changelog.d/1714.bugfix
new file mode 100644
index 000000000..164c2fc77
--- /dev/null
+++ b/changes/changelog.d/1714.bugfix
@@ -0,0 +1 @@
+Resolve timeouts if nodeinfo and service actor is not known (#1714)
\ No newline at end of file