diff --git a/frontend/pages/queries/QueryPage/QueryPage.tsx b/frontend/pages/queries/QueryPage/QueryPage.tsx
index ec5205dfc6..9ed4765415 100644
--- a/frontend/pages/queries/QueryPage/QueryPage.tsx
+++ b/frontend/pages/queries/QueryPage/QueryPage.tsx
@@ -47,13 +47,21 @@ const QueryPage = ({
   location,
 }: IQueryPageProps): JSX.Element => {
   const queryId = paramsQueryId ? parseInt(paramsQueryId, 10) : null;
-  const { currentTeamSummary: teamForQuery } = useTeamIdParam({
+  const {
+    currentTeamName: teamName,
+    teamIdForApi: apiTeamIdForQuery,
+  } = useTeamIdParam({
     location,
     router,
     includeAllTeams: true,
     includeNoTeam: false,
   });
 
+  const teamForQuery =
+    apiTeamIdForQuery && teamName
+      ? { id: apiTeamIdForQuery, name: teamName }
+      : undefined;
+
   const handlePageError = useErrorHandler();
   const {
     isGlobalAdmin,
diff --git a/frontend/pages/queries/QueryPage/screens/QueryEditor.tsx b/frontend/pages/queries/QueryPage/screens/QueryEditor.tsx
index 46ccdf1c1f..99160b43ac 100644
--- a/frontend/pages/queries/QueryPage/screens/QueryEditor.tsx
+++ b/frontend/pages/queries/QueryPage/screens/QueryEditor.tsx
@@ -98,7 +98,7 @@ const QueryEditor = ({
     } catch (createError: any) {
       if (createError.data.errors[0].reason.includes("already exists")) {
         const teamErrorText =
-          teamForQuery && teamForQuery?.id !== -1
+          teamForQuery && teamForQuery?.id !== 0
             ? `the ${teamForQuery.name} team`
             : "all teams";
         setBackendValidators({