diff --git a/packages/buefy-next/src/components/skeleton/Skeleton.vue b/packages/buefy-next/src/components/skeleton/Skeleton.vue
index 82563bf33..461ea84a6 100644
--- a/packages/buefy-next/src/components/skeleton/Skeleton.vue
+++ b/packages/buefy-next/src/components/skeleton/Skeleton.vue
@@ -1,77 +1,76 @@
 <script>
 import { h as createElement } from 'vue'
 
-export default {
-    name: 'BSkeleton',
-    functional: true,
-    props: {
-        active: {
-            type: Boolean,
-            default: true
-        },
-        animated: {
-            type: Boolean,
-            default: true
-        },
-        width: [Number, String],
-        height: [Number, String],
-        circle: Boolean,
-        rounded: {
-            type: Boolean,
-            default: true
-        },
-        count: {
-            type: Number,
-            default: 1
-        },
-        position: {
-            type: String,
-            default: '',
-            validator(value) {
-                return [
-                    '',
-                    'is-centered',
-                    'is-right'
-                ].indexOf(value) > -1
+const BSkeleton = (props) => {
+    if (!props.active) return
+    const items = []
+    const width = props.width
+    const height = props.height
+    for (let i = 0; i < props.count; i++) {
+        items.push(createElement('div', {
+            class: [
+                'b-skeleton-item',
+                { 'is-rounded': props.rounded }
+            ],
+            key: i,
+            style: {
+                height: height === undefined
+                    ? null
+                    : (isNaN(height) ? height : height + 'px'),
+                width: width === undefined
+                    ? null
+                    : (isNaN(width) ? width : width + 'px'),
+                borderRadius: props.circle ? '50%' : null
             }
+        }))
+    }
+    return createElement(
+        'div',
+        {
+            class: [
+                'b-skeleton',
+                props.size,
+                props.position,
+                { 'is-animated': props.animated }
+            ]
         },
-        size: String
+        items
+    )
+}
+
+BSkeleton.props = {
+    active: {
+        type: Boolean,
+        default: true
     },
-    render(props) {
-        if (!props.active) return
-        const items = []
-        const width = props.width
-        const height = props.height
-        for (let i = 0; i < props.count; i++) {
-            items.push(createElement('div', {
-                class: [
-                    'b-skeleton-item',
-                    { 'is-rounded': props.rounded }
-                ],
-                key: i,
-                style: {
-                    height: height === undefined
-                        ? null
-                        : (isNaN(height) ? height : height + 'px'),
-                    width: width === undefined
-                        ? null
-                        : (isNaN(width) ? width : width + 'px'),
-                    borderRadius: props.circle ? '50%' : null
-                }
-            }))
+    animated: {
+        type: Boolean,
+        default: true
+    },
+    width: [Number, String],
+    height: [Number, String],
+    circle: Boolean,
+    rounded: {
+        type: Boolean,
+        default: true
+    },
+    count: {
+        type: Number,
+        default: 1
+    },
+    position: {
+        type: String,
+        default: '',
+        validator(value) {
+            return [
+                '',
+                'is-centered',
+                'is-right'
+            ].indexOf(value) > -1
         }
-        return createElement(
-            'div',
-            {
-                class: [
-                    'b-skeleton',
-                    props.size,
-                    props.position,
-                    { 'is-animated': props.animated }
-                ]
-            },
-            items
-        )
-    }
+    },
+    size: String
 }
+
+export default BSkeleton
 </script>
diff --git a/packages/buefy-next/src/components/skeleton/index.js b/packages/buefy-next/src/components/skeleton/index.js
index 3ac9dcb49..5ba46314f 100644
--- a/packages/buefy-next/src/components/skeleton/index.js
+++ b/packages/buefy-next/src/components/skeleton/index.js
@@ -4,7 +4,9 @@ import { use, registerComponent } from '../../utils/plugins'
 
 const Plugin = {
     install(Vue) {
-        registerComponent(Vue, Skeleton)
+        // explicit `name` is needed to avoid name mangling of
+        // Functional Component in production
+        registerComponent(Vue, Skeleton, 'BSkeleton')
     }
 }