diff --git a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
index 4f49355b9a8..f85e21497cd 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
@@ -144,7 +144,7 @@ export const CreateWorkspace = () => {
   );
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === Key.Enter && !isSubmitting) {
+    if (event.key === Key.Enter) {
       event.preventDefault();
       handleSubmit(onSubmit)();
     }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
index 8f0c79feafa..8f32b63a31f 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -304,18 +304,6 @@ export class WorkspaceService extends TypeOrmQueryService<WorkspaceEntity> {
       throw new BadRequestException("'displayName' not provided");
     }
 
-    if (
-      workspace.activationStatus === WorkspaceActivationStatus.ACTIVE
-    ) {
-      this.logger.log(
-        `Workspace ${workspace.id} is already active, returning existing workspace`,
-      );
-
-      return await this.workspaceRepository.findOneBy({
-        id: workspace.id,
-      });
-    }
-
     if (
       workspace.activationStatus === WorkspaceActivationStatus.ONGOING_CREATION
     ) {