diff --git a/src/features/settings/index.tsx b/src/features/settings/index.tsx
index b426a0f96..f04f311a8 100644
--- a/src/features/settings/index.tsx
+++ b/src/features/settings/index.tsx
@@ -66,9 +66,11 @@ const Settings = () => {
             <ListItem label={intl.formatMessage(messages.editProfile)} to='/settings/profile'>
               <span className='max-w-full truncate'>{displayName}</span>
             </ListItem>
-            <ListItem label={intl.formatMessage(messages.editIdentity)} to='/settings/identity'>
-              <span className='max-w-full truncate'>{account?.source?.nostr?.nip05}</span>
-            </ListItem>
+            {features.nip05 && (
+              <ListItem label={intl.formatMessage(messages.editIdentity)} to='/settings/identity'>
+                <span className='max-w-full truncate'>{account?.source?.nostr?.nip05}</span>
+              </ListItem>
+            )}
           </List>
         </CardBody>
 
diff --git a/src/features/ui/index.tsx b/src/features/ui/index.tsx
index 527b3d915..b206a647b 100644
--- a/src/features/ui/index.tsx
+++ b/src/features/ui/index.tsx
@@ -307,7 +307,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       {features.scheduledStatuses && <WrappedRoute path='/scheduled_statuses' page={DefaultPage} component={ScheduledStatuses} content={children} />}
 
       <WrappedRoute path='/settings/profile' page={DefaultPage} component={EditProfile} content={children} />
-      <WrappedRoute path='/settings/identity' page={DefaultPage} component={EditIdentity} content={children} />
+      {features.nip05 && <WrappedRoute path='/settings/identity' page={DefaultPage} component={EditIdentity} content={children} />}
       {features.exportData && <WrappedRoute path='/settings/export' page={DefaultPage} component={ExportData} content={children} />}
       {features.importData && <WrappedRoute path='/settings/import' page={DefaultPage} component={ImportData} content={children} />}
       {features.accountAliases && <WrappedRoute path='/settings/aliases' page={DefaultPage} component={Aliases} content={children} />}