diff --git a/Civi/Funding/EventSubscriber/Remote/FundingRequestInitSubscriber.php b/Civi/Funding/EventSubscriber/Remote/FundingRequestInitSubscriber.php
index f3f7e843..0046e2a2 100644
--- a/Civi/Funding/EventSubscriber/Remote/FundingRequestInitSubscriber.php
+++ b/Civi/Funding/EventSubscriber/Remote/FundingRequestInitSubscriber.php
@@ -59,10 +59,10 @@ public function onRemoteRequestInit(InitApiRequestEvent $event): void {
     if (!$request instanceof GetFieldsAction || NULL !== $remoteContactId) {
       $this->requestContext->setRemote(TRUE);
     }
-    if (NULL !== $remoteContactId) {
+    $this->requestContext->setRemoteContactId($remoteContactId);
+    if (NULL !== $remoteContactId && '' !== $remoteContactId) {
       $contactId = $this->remoteContactIdResolver->getContactId($remoteContactId);
       $request->setExtraParam('contactId', $contactId);
-      $this->requestContext->setRemoteContactId($remoteContactId);
       $this->requestContext->setResolvedContactId($contactId);
     }
   }