diff --git a/packages/app/src/components/create-workspace/index.tsx b/packages/app/src/components/create-workspace/index.tsx
index 2c17e6a24..2c374a990 100644
--- a/packages/app/src/components/create-workspace/index.tsx
+++ b/packages/app/src/components/create-workspace/index.tsx
@@ -57,8 +57,10 @@ export const CreateWorkspaceModal = ({ open, onClose }: ModalProps) => {
             <Input
               onKeyDown={handleKeyDown}
               placeholder={t('Set a Workspace name')}
+              maxLength={15}
+              minLength={0}
               onChange={value => {
-                setWorkspaceName(value.slice(0, 15));
+                setWorkspaceName(value);
               }}
             ></Input>
             <Button
diff --git a/packages/app/src/components/workspace-setting/general/General.tsx b/packages/app/src/components/workspace-setting/general/General.tsx
index 5b5bc2684..ca2cf197b 100644
--- a/packages/app/src/components/workspace-setting/general/General.tsx
+++ b/packages/app/src/components/workspace-setting/general/General.tsx
@@ -85,8 +85,8 @@ export const GeneralPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
             height={32}
             value={workspaceName}
             placeholder={t('Workspace Name')}
-            maxLength={14}
-            minLength={1}
+            maxLength={15}
+            minLength={0}
             disabled={!isOwner}
             onChange={handleChangeWorkSpaceName}
           ></StyledInput>
diff --git a/packages/app/src/ui/input/Input.tsx b/packages/app/src/ui/input/Input.tsx
index 1ca8b8684..0b4610d86 100644
--- a/packages/app/src/ui/input/Input.tsx
+++ b/packages/app/src/ui/input/Input.tsx
@@ -38,8 +38,9 @@ export const Input = (props: inputProps) => {
     if (
       (maxLength && e.target.value.length > maxLength) ||
       (minLength && e.target.value.length < minLength)
-    )
+    ) {
       return;
+    }
     setValue(e.target.value);
     onChange && onChange(e.target.value);
   };