diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
index 52464e26a7..a4afc25bfc 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -93,7 +93,6 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
       enableReinitialize: true,
       onSubmit: (request) => {
         if (!verifyExternalAuth()) {
-          form.setSubmitting(false);
           return;
         }
 
@@ -138,7 +137,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
             )}
             <TextField
               {...getFieldHelpers("name")}
-              disabled={form.isSubmitting}
+              disabled={creatingWorkspace}
               onChange={onChangeTrimmed(form)}
               autoFocus
               fullWidth
@@ -205,7 +204,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
                   disabled:
                     disabledParamsList?.includes(
                       parameter.name.toLowerCase().replace(/ /g, "_"),
-                    ) || form.isSubmitting,
+                    ) || creatingWorkspace,
                 };
               }}
             />
@@ -226,7 +225,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
                   disabled:
                     disabledParamsList?.includes(
                       parameter.name.toLowerCase().replace(/ /g, "_"),
-                    ) || form.isSubmitting,
+                    ) || creatingWorkspace,
                 };
               }}
             />