diff --git a/apps/web/preset.config.mjs b/apps/web/preset.config.mjs
index a7641c70e5..5692b456cb 100644
--- a/apps/web/preset.config.mjs
+++ b/apps/web/preset.config.mjs
@@ -28,7 +28,7 @@ const buildPreset = {
     enableLegacyCloud: false,
     changelogUrl: 'https://affine.pro/blog/whats-new-affine-0630',
     enablePreloading: true,
-    enableNewSettingModal: false,
+    enableNewSettingModal: true,
     enableNewSettingUnstableApi: false,
     enableSQLiteProvider: false,
     enableNotificationCenter: false,
diff --git a/apps/web/src/components/root-app-sidebar/index.tsx b/apps/web/src/components/root-app-sidebar/index.tsx
index ea8e5bf911..752ac1c509 100644
--- a/apps/web/src/components/root-app-sidebar/index.tsx
+++ b/apps/web/src/components/root-app-sidebar/index.tsx
@@ -175,30 +175,20 @@ export const RootAppSidebar = ({
           >
             <span data-testid="all-pages">{t['All pages']()}</span>
           </RouteMenuLinkItem>
-          <RouteMenuLinkItem
-            data-testid="slider-bar-workspace-setting-button"
-            icon={<SettingsIcon />}
-            currentPath={currentPath}
-            path={currentWorkspaceId && paths.setting(currentWorkspaceId)}
-          >
-            <span data-testid="settings">{t['Settings']()}</span>
-          </RouteMenuLinkItem>
+          {!runtimeConfig.enableNewSettingModal && (
+            <RouteMenuLinkItem
+              data-testid="slider-bar-workspace-setting-button"
+              icon={<SettingsIcon />}
+              currentPath={currentPath}
+              path={currentWorkspaceId && paths.setting(currentWorkspaceId)}
+            >
+              <span data-testid="settings">{t['Settings']()}</span>
+            </RouteMenuLinkItem>
+          )}
           {runtimeConfig.enableNewSettingModal ? (
             <MenuItem icon={<SettingsIcon />} onClick={onOpenSettingModal}>
               <span data-testid="settings-modal-trigger">
                 {t['Settings']()}
-                <i
-                  style={{
-                    background: 'var(--affine-palette-line-blue)',
-                    borderRadius: '2px',
-                    fontSize: '8px',
-                    padding: '0 5px',
-                    color: 'var(--affine-white)',
-                    marginLeft: '15px',
-                  }}
-                >
-                  NEW
-                </i>
               </span>
             </MenuItem>
           ) : null}
diff --git a/tests/parallels/local-first-avatar.spec.ts b/tests/parallels/local-first-avatar.spec.ts
index 37602f7c56..5960bd90cc 100644
--- a/tests/parallels/local-first-avatar.spec.ts
+++ b/tests/parallels/local-first-avatar.spec.ts
@@ -17,10 +17,12 @@ test('should create a page with a local first avatar', async ({ page }) => {
   await page.getByTestId('create-workspace-create-button').click();
   await page.getByTestId('workspace-name').click();
   await page.getByTestId('workspace-card').nth(1).click();
-  await page.getByTestId('slider-bar-workspace-setting-button').click();
+  await page.getByTestId('settings-modal-trigger').click();
+  await page.getByText('current').click();
   await page
     .getByTestId('upload-avatar')
     .setInputFiles('./tests/fixtures/smile.png');
+  await page.mouse.click(0, 0);
   await page.getByTestId('workspace-name').click();
   await page.getByTestId('workspace-card').nth(0).click();
   await page.waitForTimeout(1000);