diff --git a/src/components/Accordion/index.tsx b/src/components/Accordion/index.tsx
index ee0857aee571..c65ab54a37dc 100644
--- a/src/components/Accordion/index.tsx
+++ b/src/components/Accordion/index.tsx
@@ -77,8 +77,8 @@ function Accordion({isExpanded, children, duration = 300, isToggleTriggered, sty
         }
 
         return {
-            height: !isToggleTriggered.get() ? undefined : derivedHeight.get(),
-            maxHeight: !isToggleTriggered.get() ? undefined : derivedHeight.get(),
+            height: !isToggleTriggered.get() ? 'auto' : derivedHeight.get(),
+            maxHeight: !isToggleTriggered.get() ? 'none' : derivedHeight.get(),
             opacity: derivedOpacity.get(),
             overflow: isAnimating.get() ? 'hidden' : 'visible',
             display,