--- a/dom/serviceworkers/ServiceWorkerManager.cpp
+++ b/dom/serviceworkers/ServiceWorkerManager.cpp
@@ -2213,16 +2213,18 @@ ServiceWorkerManager::DispatchFetchEvent
                            : SystemGroup::EventTargetFor(TaskCategory::Other);
 
           reservedClient.reset();
           reservedClient = ClientManager::CreateSource(ClientType::Window,
                                                        target,
                                                        principal);
 
           loadInfo->GiveReservedClientSource(Move(reservedClient));
+
+          clientInfo = loadInfo->GetReservedClientInfo();
         }
       }
 
       // First, attempt to mark the reserved client controlled directly.  This
       // will update the controlled status in the ClientManagerService in the
       // parent.  It will also eventually propagate back to the ClientSource.
       StartControllingClient(clientInfo.ref(), registration);
     }