diff --git a/frontend/src/component/feature/FeatureForm/FeatureForm.tsx b/frontend/src/component/feature/FeatureForm/FeatureForm.tsx
index 9ecfa3619445..79928e2aed90 100644
--- a/frontend/src/component/feature/FeatureForm/FeatureForm.tsx
+++ b/frontend/src/component/feature/FeatureForm/FeatureForm.tsx
@@ -157,18 +157,28 @@ const FeatureForm: React.FC<IFeatureToggleForm> = ({
                                 <dd>
                                     <code>{featureNaming?.pattern}</code>
                                 </dd>
-                                {Boolean(featureNaming?.example) && (
-                                    <>
-                                        <dt>Example</dt>
-                                        <dd>{featureNaming?.example}</dd>
-                                    </>
-                                )}
-                                {Boolean(featureNaming?.description) && (
-                                    <>
-                                        <dt>Description</dt>
-                                        <dd>{featureNaming?.description}</dd>
-                                    </>
-                                )}
+                                <ConditionallyRender
+                                    condition={Boolean(featureNaming?.example)}
+                                    show={
+                                        <>
+                                            <dt>Example</dt>
+                                            <dd>{featureNaming?.example}</dd>
+                                        </>
+                                    }
+                                />
+                                <ConditionallyRender
+                                    condition={Boolean(
+                                        featureNaming?.description
+                                    )}
+                                    show={
+                                        <>
+                                            <dt>Description</dt>
+                                            <dd>
+                                                {featureNaming?.description}
+                                            </dd>
+                                        </>
+                                    }
+                                />
                             </dl>
                         </StyledFlagNamingInfo>
                     }