diff --git a/frontend/context/policy.tsx b/frontend/context/policy.tsx
index 1e1bf424dc..0e55a6c6be 100644
--- a/frontend/context/policy.tsx
+++ b/frontend/context/policy.tsx
@@ -155,6 +155,7 @@ const reducer = (state: InitialStateType, action: IAction) => {
   }
 };
 
+// TODO: Can we remove policyTeamId in favor of always using URL team_id param?
 export const PolicyContext = createContext<InitialStateType>(initialState);
 
 const PolicyProvider = ({ children }: Props): JSX.Element => {
diff --git a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
index 726aec205c..0d1a0b6b46 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
@@ -464,7 +464,9 @@ const HostDetailsPage = ({
     setLastEditedQueryBody(osPolicyQuery);
     setLastEditedQueryResolution("");
     setLastEditedQueryCritical(false);
-    router.replace(NEW_POLICY);
+    router.replace(
+      `${NEW_POLICY}${host?.team_id ? `?team_id=${host?.team_id}` : ""}`
+    );
   };
 
   const onDestroyHost = async () => {
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/OSPolicyModal/OSPolicyModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/OSPolicyModal/OSPolicyModal.tsx
index 94773b2f7e..fea68bbda8 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/OSPolicyModal/OSPolicyModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/OSPolicyModal/OSPolicyModal.tsx
@@ -12,7 +12,7 @@ import Icon from "components/Icon/Icon";
 
 import { ITeam } from "interfaces/team";
 
-interface IRenderOSPolicyModal {
+interface IOSPolicyModal {
   onCreateNewPolicy: (team: ITeam) => void;
   onCancel: () => void;
   osVersion?: string;
@@ -30,7 +30,7 @@ const OSPolicyModal = ({
   detailsUpdatedAt,
   osPolicy,
   osPolicyLabel,
-}: IRenderOSPolicyModal): JSX.Element => {
+}: IOSPolicyModal): JSX.Element => {
   const [copyMessage, setCopyMessage] = useState("");
 
   const renderOsPolicyLabel = () => {