diff --git a/package.json b/package.json
index b5b5a66..ef204df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-tippy",
-  "version": "6.1.0-beta.2",
+  "version": "6.1.0",
   "main": "index.js",
   "module": "dist/vue-tippy.mjs",
   "unpkg": "dist/vue-tippy.iife.js",
diff --git a/playground/pages/Wga.vue b/playground/pages/Wga.vue
index 7a1ed5c..06d2608 100644
--- a/playground/pages/Wga.vue
+++ b/playground/pages/Wga.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tippy content="Choose an aggregation for this area">
+    <tippy content="Choose an aggregation for this area" :tag="null">
       <button  class="text-sm py-2 px-3 bg-gray-900 text-white rounded-lg">Aggregation #1</button>
     </tippy>
   </div>
diff --git a/src/components/Tippy.ts b/src/components/Tippy.ts
index 8451420..59fb76b 100644
--- a/src/components/Tippy.ts
+++ b/src/components/Tippy.ts
@@ -95,7 +95,7 @@ const TippyComponent = defineComponent({
       return options
     }
 
-    let target: any = () =>  elem.value
+    let target: any = () => elem.value
 
     if (props.to) {
       if (typeof Element !== 'undefined' && props.to instanceof Element) {
@@ -125,7 +125,7 @@ const TippyComponent = defineComponent({
 
       if (slots.content)
         tippy.setContent(() => contentElem.value)
-    },{ deep: true})
+    }, { deep: true })
 
     let exposed = reactive({
       elem,
@@ -139,9 +139,30 @@ const TippyComponent = defineComponent({
     return () => {
       const slot = slots.default ? slots.default(exposed) : []
 
-      const tag = typeof props.tag === 'string' ? resolveComponent(props.tag as string) : props.tag
       const contentTag = typeof props.contentTag === 'string' ? resolveComponent(props.contentTag as string) : props.contentTag
 
+      if (!props.tag) {
+        const trigger = h(slot[0] as any, {
+          ref: elem, 'data-v-tippy': ''
+        });
+
+        return slots.content ?
+          [
+            trigger, h(
+              contentTag,
+              {
+                ref: contentElem,
+                style: { display: mounted.value ? 'inherit' : 'none' },
+                class: props.contentClass
+              },
+              slots.content(exposed)
+            )
+          ]
+          : trigger
+      }
+
+      const tag = typeof props.tag === 'string' ? resolveComponent(props.tag as string) : props.tag
+
       return h(tag, { ref: elem, 'data-v-tippy': '' }, slots.content ? [
         slot,
         h(