diff --git a/packages/core/src/composables/useVueFlow.ts b/packages/core/src/composables/useVueFlow.ts
index c4f7427a0..0996e2048 100644
--- a/packages/core/src/composables/useVueFlow.ts
+++ b/packages/core/src/composables/useVueFlow.ts
@@ -19,7 +19,7 @@ type Scope = (EffectScope & { vueFlowId: string }) | undefined
  *
  * @public
  * @returns a vue flow store instance
- * @param idOrOpts - id of the store instance or options to create a new store instance
+ * @param idOrOpts - id of the store instance or options to pass to the store instance (options are deprecated!)
  */
 export function useVueFlow(id?: string): VueFlowStore
 export function useVueFlow(options?: FlowOptions): VueFlowStore
diff --git a/packages/core/src/context/VueFlowProvider.vue b/packages/core/src/context/VueFlowProvider.vue
new file mode 100644
index 000000000..9ad844372
--- /dev/null
+++ b/packages/core/src/context/VueFlowProvider.vue
@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+import { inject } from 'vue'
+import { useVueFlow } from '../composables'
+import { VueFlow } from './'
+
+const hasInjection = inject(VueFlow, null)
+
+if (!hasInjection) {
+  useVueFlow()
+}
+</script>
+
+<template>
+  <slot />
+</template>