diff --git a/package.json b/package.json
index 0c855f507..e595c07af 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^1.5.3",
     "gulp-uglifycss": "^1.0.6",
-    "mitt": "^2.1.0",
     "node-sass": "^4.12.0",
     "primeflex": "2.0.0",
     "primeicons": "4.1.0",
diff --git a/src/App.vue b/src/App.vue
index df9c31a79..617c4f2b4 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,7 +35,7 @@ import AppTopBar from '@/AppTopBar.vue';
 import AppMenu from '@/AppMenu.vue';
 import AppFooter from '@/AppFooter.vue';
 import AppConfigurator from '@/AppConfigurator.vue';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     data() {
diff --git a/src/AppConfigurator.vue b/src/AppConfigurator.vue
index d7ac1de4b..74ae8d2a1 100755
--- a/src/AppConfigurator.vue
+++ b/src/AppConfigurator.vue
@@ -350,7 +350,7 @@
 </template>
 
 <script>
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     props: {
diff --git a/src/AppEventBus.js b/src/AppEventBus.js
new file mode 100644
index 000000000..844a1b111
--- /dev/null
+++ b/src/AppEventBus.js
@@ -0,0 +1,3 @@
+import {EventBus} from 'primevue/utils';
+
+export default EventBus();
\ No newline at end of file
diff --git a/src/EventBus.js b/src/EventBus.js
deleted file mode 100644
index e842d6c11..000000000
--- a/src/EventBus.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import mitt from 'mitt';
-const EventBus = mitt();
-export default EventBus;
\ No newline at end of file
diff --git a/src/components/confirmationeventbus/ConfirmationEventBus.js b/src/components/confirmationeventbus/ConfirmationEventBus.js
index d90022a4d..844a1b111 100644
--- a/src/components/confirmationeventbus/ConfirmationEventBus.js
+++ b/src/components/confirmationeventbus/ConfirmationEventBus.js
@@ -1,4 +1,3 @@
-import mitt from 'mitt';
-const EventBus = mitt();
+import {EventBus} from 'primevue/utils';
 
-export default EventBus;
\ No newline at end of file
+export default EventBus();
\ No newline at end of file
diff --git a/src/components/terminalservice/TerminalService.js b/src/components/terminalservice/TerminalService.js
index f82cf4c21..844a1b111 100755
--- a/src/components/terminalservice/TerminalService.js
+++ b/src/components/terminalservice/TerminalService.js
@@ -1,4 +1,3 @@
-import mitt from 'mitt';
-const TerminalService = mitt();
+import {EventBus} from 'primevue/utils';
 
-export default TerminalService;
\ No newline at end of file
+export default EventBus();
\ No newline at end of file
diff --git a/src/components/toasteventbus/ToastEventBus.js b/src/components/toasteventbus/ToastEventBus.js
index d90022a4d..844a1b111 100755
--- a/src/components/toasteventbus/ToastEventBus.js
+++ b/src/components/toasteventbus/ToastEventBus.js
@@ -1,4 +1,3 @@
-import mitt from 'mitt';
-const EventBus = mitt();
+import {EventBus} from 'primevue/utils';
 
-export default EventBus;
\ No newline at end of file
+export default EventBus();
\ No newline at end of file
diff --git a/src/components/utils/EventBus.js b/src/components/utils/EventBus.js
new file mode 100644
index 000000000..2e18a56d1
--- /dev/null
+++ b/src/components/utils/EventBus.js
@@ -0,0 +1,25 @@
+export default function handler() {
+    let eventTarget = document.body.appendChild(document.createComment(''));
+    let eventListener, eventKey;
+
+    return {
+        on(type, listener, key) {
+            eventKey = key;
+            eventListener = function(e) { listener(e.detail); };
+            eventTarget.addEventListener(type, eventListener);
+        },
+        once(type, listener, key) {
+            eventKey = key;
+            eventListener = function(e) { listener(e.detail); };
+            eventTarget.addEventListener(type, eventListener, { once: true });
+        },
+        off(type, key) {
+            if (eventListener && eventKey === key) {
+                eventTarget.removeEventListener(type, eventListener);
+            }
+        },
+        emit(type, detail) {
+            eventTarget.dispatchEvent(new CustomEvent(type, { detail }));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/components/utils/Utils.js b/src/components/utils/Utils.js
index 6143fdf5f..87eb125bd 100644
--- a/src/components/utils/Utils.js
+++ b/src/components/utils/Utils.js
@@ -2,5 +2,6 @@ import ConnectedOverlayScrollHandler from './ConnectedOverlayScrollHandler';
 import DomHandler from './DomHandler';
 import ObjectUtils from './ObjectUtils';
 import UniqueComponentId from './UniqueComponentId';
+import EventBus from './EventBus';
 
-export {ConnectedOverlayScrollHandler,DomHandler,ObjectUtils,UniqueComponentId};
\ No newline at end of file
+export {ConnectedOverlayScrollHandler,DomHandler,ObjectUtils,UniqueComponentId,EventBus};
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 1016b29f7..8c3a64aa3 100755
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -223,7 +223,7 @@
 </template>
 
 <script>
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     data() {
diff --git a/src/views/chart/BarChartDemo.vue b/src/views/chart/BarChartDemo.vue
index 100c01f51..5ee07096f 100755
--- a/src/views/chart/BarChartDemo.vue
+++ b/src/views/chart/BarChartDemo.vue
@@ -35,7 +35,7 @@
 
 <script>
 import BarChartDoc from './BarChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     mounted() {
diff --git a/src/views/chart/ComboChartDemo.vue b/src/views/chart/ComboChartDemo.vue
index 10e172b48..e7569cbbd 100755
--- a/src/views/chart/ComboChartDemo.vue
+++ b/src/views/chart/ComboChartDemo.vue
@@ -19,7 +19,7 @@
 
 <script>
 import ComboChartDoc from './ComboChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
      mounted() {
diff --git a/src/views/chart/DoughnutChartDemo.vue b/src/views/chart/DoughnutChartDemo.vue
index 7e81f48f2..158cbbc71 100755
--- a/src/views/chart/DoughnutChartDemo.vue
+++ b/src/views/chart/DoughnutChartDemo.vue
@@ -19,7 +19,7 @@
 
 <script>
 import DoughnutChartDoc from './DoughnutChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     mounted() {
diff --git a/src/views/chart/LineChartDemo.vue b/src/views/chart/LineChartDemo.vue
index a409722f7..ccfaa77c5 100755
--- a/src/views/chart/LineChartDemo.vue
+++ b/src/views/chart/LineChartDemo.vue
@@ -30,7 +30,7 @@
 
 <script>
 import LineChartDoc from './LineChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     mounted() {
diff --git a/src/views/chart/PieChartDemo.vue b/src/views/chart/PieChartDemo.vue
index 30eaf4e4c..a1568dba3 100755
--- a/src/views/chart/PieChartDemo.vue
+++ b/src/views/chart/PieChartDemo.vue
@@ -19,7 +19,7 @@
 
 <script>
 import PieChartDoc from './PieChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     mounted() {
diff --git a/src/views/chart/PolarAreaChartDemo.vue b/src/views/chart/PolarAreaChartDemo.vue
index a36c0e0cb..3638831d0 100755
--- a/src/views/chart/PolarAreaChartDemo.vue
+++ b/src/views/chart/PolarAreaChartDemo.vue
@@ -19,7 +19,7 @@
 
 <script>
 import PolarAreaChartDoc from './PolarAreaChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     mounted() {
diff --git a/src/views/chart/RadarChartDemo.vue b/src/views/chart/RadarChartDemo.vue
index 874333601..27fab4e23 100755
--- a/src/views/chart/RadarChartDemo.vue
+++ b/src/views/chart/RadarChartDemo.vue
@@ -19,7 +19,7 @@
 
 <script>
 import RadarChartDoc from './RadarChartDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     mounted() {
diff --git a/src/views/confirmdialog/ConfirmDialogDoc.vue b/src/views/confirmdialog/ConfirmDialogDoc.vue
index ab0b580a4..1045557f8 100644
--- a/src/views/confirmdialog/ConfirmDialogDoc.vue
+++ b/src/views/confirmdialog/ConfirmDialogDoc.vue
@@ -2,13 +2,6 @@
 	<div class="content-section documentation">
 		<TabView>
 			<TabPanel header="Documentation">
-                <h5>Mitt EventBus</h5>
-                <p>ConfirmDialog requires <a href="https://www.npmjs.com/package/mitt">Mitt</a>, a tiny 200b EventBus implementation.</p>
-<pre v-code><code>
-npm install mitt --save
-
-</code></pre>
-
                 <h5>ConfirmationService</h5>
                 <p>ConfirmDialog is controlled via the <i>ConfirmationService</i> that needs to be installed globally before the application
                     instance is created.</p>
@@ -247,7 +240,7 @@ export default {
 				</div>
 
 				<h5>Dependencies</h5>
-				<p>Mitt.</p>
+				<p>None.</p>
 			</TabPanel>
 
 			<TabPanel header="Source">
diff --git a/src/views/confirmpopup/ConfirmPopupDoc.vue b/src/views/confirmpopup/ConfirmPopupDoc.vue
index f843e72f4..12b1fbe9c 100644
--- a/src/views/confirmpopup/ConfirmPopupDoc.vue
+++ b/src/views/confirmpopup/ConfirmPopupDoc.vue
@@ -2,13 +2,6 @@
 	<div class="content-section documentation">
 		<TabView>
 			<TabPanel header="Documentation">
-                <h5>Mitt EventBus</h5>
-                <p>ConfirmPopup requires <a href="https://www.npmjs.com/package/mitt">Mitt</a>, a tiny 200b EventBus implementation.</p>
-<pre v-code><code>
-npm install mitt --save
-
-</code></pre>
-
                 <h5>ConfirmationService</h5>
                 <p>ConfirmPopup is controlled via the <i>ConfirmationService</i> that needs to be installed globally before the application
                     instance is created.</p>
@@ -247,7 +240,7 @@ export default {
 				</div>
 
 				<h5>Dependencies</h5>
-				<p>Mitt.</p>
+				<p>None.</p>
 			</TabPanel>
 
 			<TabPanel header="Source">
diff --git a/src/views/liveeditor/LiveEditor.vue b/src/views/liveeditor/LiveEditor.vue
index 44e8fe301..566bb00cb 100644
--- a/src/views/liveeditor/LiveEditor.vue
+++ b/src/views/liveeditor/LiveEditor.vue
@@ -223,9 +223,7 @@ export const router = createRouter({
                 })
             }
 
-            if(this.toastService) {
-                extDependencies['mitt'] = "^2.1.0";
-                        
+            if(this.toastService) {      
                 imports += `import Toast from "primevue/toast";
 import ToastService from "primevue/toastservice";
 `;
@@ -242,10 +240,6 @@ import ToastService from "primevue/toastservice";
 `;
             }
 
-            if(this.terminalService) {
-                extDependencies['mitt'] = "^2.1.0";
-            }
-
             if(name !== 'ToastDemo' && name !== 'TooltipDemo' && name !== 'RippleDemo' && name !== 'FloatLabelDemo' && name !== 'InputGroupDemo' && name !== 'InvalidDemo' && name !== 'FormLayoutDemo') {
                 element += `app.component("${name.slice(0, -4)}", ${name.slice(0, -4)});`;
             }
diff --git a/src/views/setup/Setup.vue b/src/views/setup/Setup.vue
index b0264e650..1580ea4e4 100755
--- a/src/views/setup/Setup.vue
+++ b/src/views/setup/Setup.vue
@@ -148,10 +148,6 @@ dependencies: {
                             <td>PrimeFlex</td>
                             <td>DataView</td>
                         </tr>
-                        <tr>
-                            <td>Toast and Terminal</td>
-                            <td>Mitt</td>
-                        </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/src/views/tabview/TabViewDemo.vue b/src/views/tabview/TabViewDemo.vue
index c2707103b..10faf7353 100755
--- a/src/views/tabview/TabViewDemo.vue
+++ b/src/views/tabview/TabViewDemo.vue
@@ -128,7 +128,7 @@
 
 <script>
 import TabViewDoc from './TabViewDoc';
-import EventBus from '@/EventBus';
+import EventBus from '@/AppEventBus';
 
 export default {
     data() {
diff --git a/src/views/terminal/TerminalDoc.vue b/src/views/terminal/TerminalDoc.vue
index c16e7a9cd..40c39b5ca 100755
--- a/src/views/terminal/TerminalDoc.vue
+++ b/src/views/terminal/TerminalDoc.vue
@@ -2,13 +2,6 @@
 	<div class="content-section documentation">
 		<TabView>
 			<TabPanel header="Documentation">
-                <h5>Mitt EventBus</h5>
-                <p>Terminal requires <a href="https://www.npmjs.com/package/mitt">Mitt</a>, a tiny 200b EventBus implementation.</p>
-<pre v-code><code>
-npm install mitt --save
-
-</code></pre>
-
 				<h5>Import</h5>
 <pre v-code.script><code>
 import Terminal from 'primevue/terminal';
@@ -130,7 +123,7 @@ export default {
 				</div>
 
 				<h5>Dependencies</h5>
-				<p>Mitt.</p>
+				<p>None.</p>
 			</TabPanel>
 
 			<TabPanel header="Source">
diff --git a/src/views/toast/ToastDoc.vue b/src/views/toast/ToastDoc.vue
index ec3e5a7a1..4bc3522d2 100755
--- a/src/views/toast/ToastDoc.vue
+++ b/src/views/toast/ToastDoc.vue
@@ -2,13 +2,6 @@
 	<div class="content-section documentation">
 		<TabView>
 			<TabPanel header="Documentation">
-                <h5>Mitt EventBus</h5>
-                <p>Toast requires <a href="https://www.npmjs.com/package/mitt">Mitt</a>, a tiny 200b EventBus implementation.</p>
-<pre v-code><code>
-npm install mitt --save
-
-</code></pre>
-
                 <h5>ToastService</h5>
                 <p>Toast messages are dynamically created using a <i>ToastService</i> that needs to be installed globally before the application
                     instance is created.</p>
@@ -270,7 +263,7 @@ this.$toast.add({severity:'success', summary: 'Specific Message', group: 'mykey'
 				</div>
 
 				<h5>Dependencies</h5>
-				<p>Mitt.</p>
+				<p>None.</p>
 			</TabPanel>
 
 			<TabPanel header="Source">