diff --git a/web-ui/src/components/team-results/EditTeamModal.jsx b/web-ui/src/components/team-results/EditTeamModal.jsx
index 199205c0c..c3599c2b6 100644
--- a/web-ui/src/components/team-results/EditTeamModal.jsx
+++ b/web-ui/src/components/team-results/EditTeamModal.jsx
@@ -13,7 +13,7 @@ import Checkbox from '@mui/material/Checkbox';
 import Autocomplete from '@mui/material/Autocomplete';
 import './EditTeamModal.css';
 
-const EditTeamModal = ({ team = {}, open, onSave, onClose, headerText }) => {
+const EditTeamModal = ({ team = {active: true}, open, onSave, onClose, headerText }) => {
   const { state } = useContext(AppContext);
   const currentMembers = selectCurrentMembers(state);
   const currentUser = selectCurrentUser(state);
@@ -158,7 +158,7 @@ const EditTeamModal = ({ team = {}, open, onSave, onClose, headerText }) => {
 
   const close = () => {
     onClose();
-    setTeam({});
+    setTeam({active: true});
   };
 
   return (
@@ -179,7 +179,7 @@ const EditTeamModal = ({ team = {}, open, onSave, onClose, headerText }) => {
             label="Active"
             variant="outlined"
             className="halfWidth"
-            checked={editedTeam.active ? editedTeam.active : false}
+            checked={editedTeam.active}
             onChange={e => setTeam({ ...editedTeam, active: e.target.checked })}
         /> Active
         <TextField
@@ -195,6 +195,7 @@ const EditTeamModal = ({ team = {}, open, onSave, onClose, headerText }) => {
         <Autocomplete
           id="teamLeadSelect"
           multiple
+          freeSolo={true}
           isOptionEqualToValue={(option, value) => {
             return value ? value.memberId === option.memberId : false;
           }}
@@ -218,6 +219,7 @@ const EditTeamModal = ({ team = {}, open, onSave, onClose, headerText }) => {
         />
         <Autocomplete
           multiple
+          freeSolo={true}
           isOptionEqualToValue={(option, value) => {
             return value ? value.memberId === option.memberId : false;
           }}