diff --git a/admin/app/workspace/create/form.tsx b/admin/app/workspace/create/form.tsx
index 958f53153a2..2f528aa7830 100644
--- a/admin/app/workspace/create/form.tsx
+++ b/admin/app/workspace/create/form.tsx
@@ -39,7 +39,8 @@ export const WorkspaceCreateForm = () => {
     formState: { errors, isSubmitting, isValid },
   } = useForm<IWorkspace>({ defaultValues, mode: "onChange" });
   // derived values
-  const workspaceBaseURL = encodeURI(WEB_BASE_URL || window.location.origin + "/");
+  const baseURL = WEB_BASE_URL || window.location.origin;
+  const workspaceBaseURL = encodeURI(baseURL.endsWith("/") ? baseURL : baseURL + "/");
 
   const handleCreateWorkspace = async (formData: IWorkspace) => {
     await workspaceService