diff --git a/lib/components/T3Frame/T3Frame.vue b/lib/components/T3Frame/T3Frame.vue
index 683f0b54..cf404a22 100644
--- a/lib/components/T3Frame/T3Frame.vue
+++ b/lib/components/T3Frame/T3Frame.vue
@@ -2,7 +2,6 @@
   <div
     class="t3-ce-frame"
     :class="computedClasses"
-    v-bind="$attrs"
   >
     <slot />
   </div>
diff --git a/lib/components/T3MediaFile/type/Audio.vue b/lib/components/T3MediaFile/type/Audio.vue
index 1bf4e6c7..462f2e2c 100644
--- a/lib/components/T3MediaFile/type/Audio.vue
+++ b/lib/components/T3MediaFile/type/Audio.vue
@@ -1,6 +1,5 @@
 <template>
   <audio
-    v-bind="$attrs"
     class="t3-ce-media-audio"
     controls
   >
diff --git a/lib/components/T3MediaFile/type/Image.vue b/lib/components/T3MediaFile/type/Image.vue
index 86f86727..8a05e966 100644
--- a/lib/components/T3MediaFile/type/Image.vue
+++ b/lib/components/T3MediaFile/type/Image.vue
@@ -1,6 +1,5 @@
 <template>
   <div
-    v-bind="$attrs"
     class="t3-ce-media-image"
   >
     <component
diff --git a/lib/components/T3MediaFile/type/Video.vue b/lib/components/T3MediaFile/type/Video.vue
index 2f91c591..0cdf2a09 100644
--- a/lib/components/T3MediaFile/type/Video.vue
+++ b/lib/components/T3MediaFile/type/Video.vue
@@ -1,6 +1,5 @@
 <template>
   <video
-    v-bind="$attrs"
     class="t3-ce-media-video"
     controls
   >
diff --git a/lib/components/T3MediaFile/type/Vimeo.vue b/lib/components/T3MediaFile/type/Vimeo.vue
index 23e0e31e..43e51b59 100644
--- a/lib/components/T3MediaFile/type/Vimeo.vue
+++ b/lib/components/T3MediaFile/type/Vimeo.vue
@@ -1,6 +1,5 @@
 <template>
   <iframe
-    v-bind="$attrs"
     :src="file.publicUrl"
     :width="file.properties.dimensions.width || 640"
     :height="file.properties.dimensions.height || 360"
diff --git a/lib/components/T3MediaFile/type/Youtube.vue b/lib/components/T3MediaFile/type/Youtube.vue
index fb3b17a2..509b3332 100644
--- a/lib/components/T3MediaFile/type/Youtube.vue
+++ b/lib/components/T3MediaFile/type/Youtube.vue
@@ -2,7 +2,6 @@
   <iframe
     v-if="file.publicUrl"
     id="ytplayer"
-    v-bind="$attrs"
     :width="file.properties.dimensions.width || 640"
     :height="file.properties.dimensions.height || 360"
     :src="file.publicUrl"
diff --git a/lib/components/T3NavLink/T3NavLink.vue b/lib/components/T3NavLink/T3NavLink.vue
index a17827f3..00e6c3b2 100644
--- a/lib/components/T3NavLink/T3NavLink.vue
+++ b/lib/components/T3NavLink/T3NavLink.vue
@@ -42,7 +42,7 @@ export default {
         ...this.$data,
         ...url.data,
         props: {
-          ...this.$attrs,
+          ...this.$props,
           ...url.props
         }
       },