diff --git a/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx b/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx
index d009859659..71f0424093 100644
--- a/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx
+++ b/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx
@@ -127,19 +127,6 @@ export const AdvancedSettings = ({
             units={["minute", "day", "hour"]}
           />
 
-          <TokenLifespan
-            id="clientOfflineSessionMax"
-            name={convertAttributeNameToForm(
-              "attributes.client.offline.session.max.lifespan",
-            )}
-            defaultValue={
-              realm?.offlineSessionMaxLifespanEnabled
-                ? realm.offlineSessionMaxLifespan
-                : undefined
-            }
-            units={["minute", "day", "hour"]}
-          />
-
           <FormGroup
             label={t("oAuthMutual")}
             fieldId="oAuthMutual"
diff --git a/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx b/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
index 49aa616b75..b69ae587ba 100644
--- a/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
+++ b/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
@@ -74,7 +74,7 @@ export const TokenLifespan = ({
                 <SelectOption value={60}>{t(expires)}</SelectOption>
               </Select>
             </SplitItem>
-            <SplitItem>
+            <SplitItem hidden={!isExpireSet(field.value)}>
               <TimeSelector
                 validated={
                   isExpireSet(field.value) && field.value! < 1