diff --git a/src/components/Accordion/Accordion.vue b/src/components/Accordion/Accordion.vue
index cdf0f17..9cbff4d 100644
--- a/src/components/Accordion/Accordion.vue
+++ b/src/components/Accordion/Accordion.vue
@@ -1,10 +1,9 @@
 <template>
-  <div class="vp-raw">
-    <slot :accordionId="accordionId"/>
+  <div class="vp-raw" :data-accordion-id="accordionId">
+    <slot />
   </div>
 </template>
 <script lang="ts" setup>
-import { provide } from 'vue'
 import { nanoid } from 'nanoid'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 
@@ -20,6 +19,5 @@ const props = defineProps({
 })
 
 const accordionId = nanoid()
-provide('accordionId', accordionId)
 useAccordionState(accordionId, { ...props })
 </script>
diff --git a/src/components/Accordion/AccordionContent.vue b/src/components/Accordion/AccordionContent.vue
index b55e754..25e9274 100644
--- a/src/components/Accordion/AccordionContent.vue
+++ b/src/components/Accordion/AccordionContent.vue
@@ -1,13 +1,26 @@
 <template>
-  <div
-    :class="contentClasses"
-  >
-    <slot />
+  <div ref="content">
+    <div
+        v-if="isLoaded"
+        :class="contentClasses"
+    >
+      <slot />
+    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import { useAccordionContentClasses } from '@/components/Accordion/composables/useAccordionContentClasses'
+import { onMounted, ref } from 'vue'
 
-const { contentClasses } = useAccordionContentClasses()
+const isLoaded = ref(false)
+const content = ref()
+
+let contentClasses
+
+onMounted(() => {
+  const accordionHeaderClasses = useAccordionContentClasses(content)
+  contentClasses = accordionHeaderClasses.contentClasses
+  isLoaded.value = true
+})
 </script>
diff --git a/src/components/Accordion/AccordionHeader.vue b/src/components/Accordion/AccordionHeader.vue
index 60d4442..4b34fc6 100644
--- a/src/components/Accordion/AccordionHeader.vue
+++ b/src/components/Accordion/AccordionHeader.vue
@@ -1,40 +1,45 @@
 <template>
-  <button
-      type="button"
-      @click="toggleItem"
-      :class="headerClasses"
-  >
-    <span class="w-full"><slot /></span>
-    <svg
-        data-accordion-icon
-        :class="arrowClasses"
-        fill="currentColor"
-        viewBox="0 0 20 20"
-        xmlns="http://www.w3.org/2000/svg"
+  <div ref="header">
+    <button
+        v-if="isLoaded"
+        type="button"
+        @click="toggleItem"
+        :class="headerClasses"
     >
-      <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"></path>
-    </svg>
-  </button>
+      <span class="w-full"><slot /></span>
+      <svg
+          data-accordion-icon
+          :class="arrowClasses"
+          fill="currentColor"
+          viewBox="0 0 20 20"
+          xmlns="http://www.w3.org/2000/svg"
+      >
+        <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"></path>
+      </svg>
+    </button>
+  </div>
 </template>
 
 <script lang="ts" setup>
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
-import { computed, inject } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useAccordionHeaderClasses } from '@/components/Accordion/composables/useAccordionHeaderClasses'
 
-const accordionId: string = inject('accordionId') ?? ''
-const panelId: string = inject('panelId') ?? ''
+const isLoaded = ref(false)
+const header = ref()
+const accordionId = computed(() => header.value.parentElement.parentElement.dataset.accordionId)
+const panelId = computed(() => header.value.parentElement.dataset.panelId)
 
 const { accordionsStates } = useAccordionState()
-const accordionState = computed(() => accordionsStates[accordionId])
-const panelState = computed(() => accordionState.value.panels[panelId])
+const accordionState = computed(() => accordionsStates[accordionId.value])
+const panelState = computed(() => accordionState.value.panels[panelId.value])
 
-const { headerClasses, arrowClasses } = useAccordionHeaderClasses()
+let headerClasses, arrowClasses
 function commonToggleItem() {
   const isSelectedVisible = panelState.value.isVisible
   for (const panelIndex in accordionState.value.panels) {
     const panel = accordionState.value.panels[panelIndex]
-    if (panel.id !== panelId) panel.isVisible = false
+    if (panel.id !== panelId.value) panel.isVisible = false
     else panel.isVisible = !isSelectedVisible
   }
 }
@@ -46,4 +51,10 @@ function toggleItem() {
   commonToggleItem()
 }
 
+onMounted(() => {
+  const accordionHeaderClasses = useAccordionHeaderClasses(header)
+  headerClasses = accordionHeaderClasses.headerClasses
+  arrowClasses = accordionHeaderClasses.arrowClasses
+  isLoaded.value = true
+})
 </script>
diff --git a/src/components/Accordion/AccordionPanel.vue b/src/components/Accordion/AccordionPanel.vue
index 8687627..e478e95 100644
--- a/src/components/Accordion/AccordionPanel.vue
+++ b/src/components/Accordion/AccordionPanel.vue
@@ -1,26 +1,30 @@
 <template>
-  <div>
-    <slot></slot>
+  <div :data-panel-id="panelId" ref="panel">
+    <slot v-if="accordionId"></slot>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onBeforeMount, provide } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 import { nanoid } from 'nanoid'
 
 const { accordionsStates } = useAccordionState()
 
-const panelId = nanoid()
-const accordionId: string = inject('accordionId') ?? ''
-provide('panelId', panelId)
 
-const accordionState = computed(() => {
-  return accordionsStates[accordionId]
+const panelId = nanoid()
+const panel = ref()
+const accordionId = computed(() => {
+  if (panel.value) return panel.value.parentElement.dataset.accordionId
+  return null
 })
 
-onBeforeMount(() => {
-  const panelsCount = Object.keys(accordionState.value.panels).length
+const accordionState = computed(() => {
+  return accordionsStates[accordionId.value]
+})
+
+onMounted(() => {
+  const panelsCount = Object.keys(accordionState?.value?.panels)?.length
   accordionState.value.panels[panelId] = {
     id: panelId,
     order: panelsCount,
diff --git a/src/components/Accordion/composables/useAccordionContentClasses.ts b/src/components/Accordion/composables/useAccordionContentClasses.ts
index 4ed7b56..b11a4d0 100644
--- a/src/components/Accordion/composables/useAccordionContentClasses.ts
+++ b/src/components/Accordion/composables/useAccordionContentClasses.ts
@@ -1,29 +1,25 @@
-import { computed, inject } from 'vue'
+import { computed } from 'vue'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 import classNames from 'classnames'
 
-
 const baseContentClasses = 'p-5 border border-gray-200 dark:border-gray-700 dark:bg-gray-900'
-export function useAccordionContentClasses() {
-  const accordionId: string = inject('accordionId') ?? ''
-  const panelId: string = inject('panelId') ?? ''
-
-
+export function useAccordionContentClasses(contentRef: any) {
+  const accordionId = computed(() => contentRef.value.parentElement.parentElement.dataset.accordionId)
+  const panelId = computed(() => contentRef.value.parentElement.dataset.panelId)
   const { accordionsStates } = useAccordionState()
+  const accordionState = computed(() => accordionsStates[accordionId.value])
+  const panelState = computed(() => accordionsStates[accordionId.value].panels[panelId.value])
+  const panelsCount = computed(() => Object.keys(accordionsStates[accordionId.value].panels[panelId.value]).length)
 
-  const accordionState = computed(() => accordionsStates[accordionId])
-  const panelState = computed(() => accordionsStates[accordionId].panels[panelId])
-  const panelsCount = computed(() => Object.keys(accordionsStates[accordionId].panels[panelId]).length)
-
-  const contentClasses = computed(() => classNames(baseContentClasses, {
-    hidden: !panelState.value.isVisible,
-    'border-b-0': panelState.value.order !== panelsCount.value - 1 || accordionState.value.flush,
-    'border-t-0': panelState.value.order === panelsCount.value - 1,
-    'border-x-0': accordionState.value.flush,
-  }))
+  const contentClasses = computed(() => {
+    return classNames(baseContentClasses, {
+      hidden: !panelState.value.isVisible,
+      'border-b-0': panelState.value.order !== panelsCount.value - 1 || accordionState.value.flush,
+      'border-t-0': panelState.value.order === panelsCount.value - 1,
+      'border-x-0': accordionState.value.flush,
+    })
+  })
   return {
     contentClasses,
   }
 }
-
-
diff --git a/src/components/Accordion/composables/useAccordionHeaderClasses.ts b/src/components/Accordion/composables/useAccordionHeaderClasses.ts
index 75e60f0..0fdd9dc 100644
--- a/src/components/Accordion/composables/useAccordionHeaderClasses.ts
+++ b/src/components/Accordion/composables/useAccordionHeaderClasses.ts
@@ -1,35 +1,34 @@
-import { computed, inject } from 'vue'
+import { computed } from 'vue'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 import classNames from 'classnames'
 
-
-const baseHeaderClasses = 'flex items-center p-5 w-full font-medium text-left text-gray-500 border border-gray-200 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-800 dark:border-gray-700 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800'
+const baseHeaderClasses =
+  'flex items-center p-5 w-full font-medium text-left text-gray-500 border border-gray-200 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-800 dark:border-gray-700 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800'
 const baseArrowClasses = 'w-6 h-6 shrink-0'
-export function useAccordionHeaderClasses() {
-  const accordionId: string = inject('accordionId') ?? ''
-  const panelId: string = inject('panelId') ?? ''
-
+export function useAccordionHeaderClasses(headerRef: any) {
+  const accordionId = computed(() => headerRef.value.parentElement.parentElement.dataset.accordionId)
+  const panelId = computed(() => headerRef.value.parentElement.dataset.panelId)
   const { accordionsStates } = useAccordionState()
-  const accordionState = computed(() => accordionsStates[accordionId])
-  const panelState = computed(() => accordionState.value.panels[panelId])
+  const accordionState = computed(() => accordionsStates[accordionId.value])
+  const panelState = computed(() => accordionState.value.panels[panelId.value])
   const panelsCount = computed(() => Object.keys(panelState.value).length)
   const isPanelLast = computed(() => panelState.value.order !== panelsCount.value - 1)
-  const isBottomBorderVisibleForFlush = computed(() =>
-    isPanelLast.value ||
-    (accordionState.value.flush && panelState.value.order === panelsCount.value - 1 && !panelState.value.isVisible))
+  const isBottomBorderVisibleForFlush = computed(() => isPanelLast.value || (accordionState.value.flush && panelState.value.order === panelsCount.value - 1 && !panelState.value.isVisible))
 
-  const headerClasses = computed(() => classNames(baseHeaderClasses, {
-    'bg-gray-100 dark:bg-gray-800': panelState.value.isVisible,
-    'rounded-t-xl': panelState.value.order === 0 && !accordionState.value.flush,
-    'border-t-0': panelState.value.order === 0 && accordionState.value.flush,
-    'border-b-0': isBottomBorderVisibleForFlush.value,
-    'border-x-0': accordionState.value.flush,
-  }))
-  const arrowClasses = computed(() => classNames(baseArrowClasses,{ 'rotate-180': panelState.value.isVisible }))
+  const headerClasses = computed(() => {
+    return classNames(baseHeaderClasses, {
+      'bg-gray-100 dark:bg-gray-800': panelState.value.isVisible,
+      'rounded-t-xl': panelState.value.order === 0 && !accordionState.value.flush,
+      'border-t-0': panelState.value.order === 0 && accordionState.value.flush,
+      'border-b-0': isBottomBorderVisibleForFlush.value,
+      'border-x-0': accordionState.value.flush,
+    })
+  })
+  const arrowClasses = computed(() => {
+    return classNames(baseArrowClasses, { 'rotate-180': panelState.value.isVisible })
+  })
   return {
     headerClasses,
     arrowClasses,
   }
 }
-
-