diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx
index a6dcfdb63d..c07bd7154f 100644
--- a/apps/web/components/dialog/EditLocationDialog.tsx
+++ b/apps/web/components/dialog/EditLocationDialog.tsx
@@ -357,9 +357,9 @@ export const EditLocationDialog = (props: ISetLocationDialog) => {
                             onChange={(val) => {
                               if (val) {
                                 locationFormMethods.setValue("locationType", val.value);
-                                if (!!val.credentialId) {
+                                if (typeof val.credentialId === "number" && val.credentialId >= 0) {
                                   locationFormMethods.setValue("credentialId", val.credentialId);
-                                  locationFormMethods.setValue("teamName", val.teamName);
+                                  locationFormMethods.setValue("teamName", val.teamName ?? "");
                                 }
 
                                 locationFormMethods.unregister([