diff --git a/src/Faction/ui/CreateGangPopup.tsx b/src/Faction/ui/CreateGangPopup.tsx
index 50e14ad2e..e47579d92 100644
--- a/src/Faction/ui/CreateGangPopup.tsx
+++ b/src/Faction/ui/CreateGangPopup.tsx
@@ -4,16 +4,19 @@
 import React from "react";
 import { removePopup } from "../../ui/React/createPopup";
 import { StdButton } from "../../ui/React/StdButton";
-import { use } from "../../ui/Context";
+import { IRouter } from "../../ui/Router";
+import { IPlayer } from "../../PersonObjects/IPlayer";
 
 interface ICreateGangPopupProps {
   popupId: string;
   facName: string;
+  player: IPlayer;
+  router: IRouter;
 }
 
 export function CreateGangPopup(props: ICreateGangPopupProps): React.ReactElement {
-  const player = use.Player();
-  const router = use.Router();
+  const player = props.player;
+  const router = props.router;
   const combatGangText =
     "This is a COMBAT gang. Members in this gang will have different tasks than HACKING gangs. " +
     "Compared to hacking gangs, progression with combat gangs can be more difficult as territory management " +
diff --git a/src/Faction/ui/FactionRoot.tsx b/src/Faction/ui/FactionRoot.tsx
index e2fffe45b..9ec42113e 100644
--- a/src/Faction/ui/FactionRoot.tsx
+++ b/src/Faction/ui/FactionRoot.tsx
@@ -80,6 +80,8 @@ export function FactionRoot(props: IProps): React.ReactElement {
     createPopup(popupId, CreateGangPopup, {
       popupId: popupId,
       facName: faction.name,
+      player: player,
+      router: router,
     });
   }