diff --git a/components/lib/toast/BaseToast.vue b/components/lib/toast/BaseToast.vue
index c7009041a..ea4beb705 100644
--- a/components/lib/toast/BaseToast.vue
+++ b/components/lib/toast/BaseToast.vue
@@ -105,7 +105,32 @@ const classes = {
             'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
-    ]
+    ],
+    container: ({ props }) => [
+        'p-toast-message',
+        props.message.styleClass,
+        {
+            'p-toast-message-info': props.message.severity === 'info',
+            'p-toast-message-warn': props.message.severity === 'warn',
+            'p-toast-message-error': props.message.severity === 'error',
+            'p-toast-message-success': props.message.severity === 'success'
+        }
+    ],
+    content: ({ props }) => `p-toast-message-content ${props.message.contentStyleClass || ''}`,
+    icon: ({ props }) => [
+        'p-toast-message-icon',
+        {
+            [props.infoIcon]: props.message.severity === 'info',
+            [props.warnIcon]: props.message.severity === 'warn',
+            [props.errorIcon]: props.message.severity === 'error',
+            [props.successIcon]: props.message.severity === 'success'
+        }
+    ],
+    text: 'p-toast-message-text',
+    summary: 'p-toast-summary',
+    detail: 'p-toast-detail',
+    button: 'p-toast-icon-close p-link',
+    buttonIcon: ({ props }) => ['p-toast-icon-close-icon', props.closeIcon]
 };
 
 const { load: loadStyle } = useStyle(styles, { id: 'primevue_toast_style', manual: true });
diff --git a/components/lib/toast/BaseToastMessage.vue b/components/lib/toast/BaseToastMessage.vue
deleted file mode 100644
index 75a143ffe..000000000
--- a/components/lib/toast/BaseToastMessage.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<script>
-import BaseComponent from 'primevue/basecomponent';
-
-const classes = {
-    container: ({ props }) => [
-        'p-toast-message',
-        props.message.styleClass,
-        {
-            'p-toast-message-info': props.message.severity === 'info',
-            'p-toast-message-warn': props.message.severity === 'warn',
-            'p-toast-message-error': props.message.severity === 'error',
-            'p-toast-message-success': props.message.severity === 'success'
-        }
-    ],
-    content: ({ props }) => 'p-toast-message-content ' + props.message.contentStyleClass || '',
-    icon: ({ props }) => [
-        'p-toast-message-icon',
-        {
-            [props.infoIcon]: props.message.severity === 'info',
-            [props.warnIcon]: props.message.severity === 'warn',
-            [props.errorIcon]: props.message.severity === 'error',
-            [props.successIcon]: props.message.severity === 'success'
-        }
-    ],
-    text: 'p-toast-message-text',
-    summary: 'p-toast-summary',
-    detail: 'p-toast-detail',
-    button: 'p-toast-icon-close p-link',
-    buttonIcon: ({ props }) => ['p-toast-icon-close-icon', props.closeIcon]
-};
-
-export default {
-    name: 'BaseToast',
-    extends: BaseComponent,
-    props: {
-        message: {
-            type: null,
-            default: null
-        },
-        templates: {
-            type: Object,
-            default: null
-        },
-        closeIcon: {
-            type: String,
-            default: null
-        },
-        infoIcon: {
-            type: String,
-            default: null
-        },
-        warnIcon: {
-            type: String,
-            default: null
-        },
-        errorIcon: {
-            type: String,
-            default: null
-        },
-        successIcon: {
-            type: String,
-            default: null
-        },
-        closeButtonProps: {
-            type: null,
-            default: null
-        }
-    },
-    css: {
-        classes
-    }
-};
-</script>
diff --git a/components/lib/toast/ToastMessage.vue b/components/lib/toast/ToastMessage.vue
index f3a7d7e94..0590e2247 100755
--- a/components/lib/toast/ToastMessage.vue
+++ b/components/lib/toast/ToastMessage.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import BaseToastMessage from './BaseToastMessage.vue';
+import BaseToast from './BaseToast.vue';
 import CheckIcon from 'primevue/icons/check';
 import ExclamationTriangleIcon from 'primevue/icons/exclamationtriangle';
 import InfoCircleIcon from 'primevue/icons/infocircle';
@@ -29,9 +29,43 @@ import Ripple from 'primevue/ripple';
 
 export default {
     name: 'ToastMessage',
-    extends: BaseToastMessage,
+    extends: BaseToast,
     emits: ['close'],
     closeTimeout: null,
+    props: {
+        message: {
+            type: null,
+            default: null
+        },
+        templates: {
+            type: Object,
+            default: null
+        },
+        closeIcon: {
+            type: String,
+            default: null
+        },
+        infoIcon: {
+            type: String,
+            default: null
+        },
+        warnIcon: {
+            type: String,
+            default: null
+        },
+        errorIcon: {
+            type: String,
+            default: null
+        },
+        successIcon: {
+            type: String,
+            default: null
+        },
+        closeButtonProps: {
+            type: null,
+            default: null
+        }
+    },
     mounted() {
         if (this.message.life) {
             this.closeTimeout = setTimeout(() => {