diff --git a/frontend/pages/admin/IntegrationsPage/cards/AutomaticEnrollment/components/EditTeamModal/EditTeamModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/AutomaticEnrollment/components/EditTeamModal/EditTeamModal.tsx
index cbf4750a03..96dcfb0dd9 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/AutomaticEnrollment/components/EditTeamModal/EditTeamModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/AutomaticEnrollment/components/EditTeamModal/EditTeamModal.tsx
@@ -1,7 +1,10 @@
 import React, { useState, useContext, FormEvent } from "react";
 
 import { AppContext } from "context/app";
-import { APP_CONTEXT_NO_TEAM_ID } from "interfaces/team";
+import {
+  APP_CONTEXT_NO_TEAM_ID,
+  APP_CONTEX_NO_TEAM_SUMMARY,
+} from "interfaces/team";
 import configAPI from "services/entities/config";
 
 // @ts-ignore
@@ -26,11 +29,16 @@ const EditTeamModal = ({
 
   const [selectedTeam, setSelectedTeam] = useState(defaultTeamName);
 
-  // TODO: Should this include "No team" as an option?
   const teamNameOptions = availableTeams
-    ?.filter((t) => t.id > APP_CONTEXT_NO_TEAM_ID)
+    ?.filter((t) => t.id >= APP_CONTEXT_NO_TEAM_ID)
     .map((teamSummary) => {
-      return { value: teamSummary.name, label: teamSummary.name };
+      return {
+        value:
+          teamSummary.name === APP_CONTEX_NO_TEAM_SUMMARY.name
+            ? ""
+            : teamSummary.name,
+        label: teamSummary.name,
+      };
     });
 
   const [isLoading, setIsLoading] = useState(false);