diff --git a/src/emitter.ts b/src/emitter.ts
index b3b8a59..810c88d 100644
--- a/src/emitter.ts
+++ b/src/emitter.ts
@@ -579,7 +579,7 @@ export class Emitter<
    */
   fake(events?: (keyof EventsList | Constructor<any>)[]): EventsBuffer<EventsList> {
     this.restore()
-    this.#eventsBuffer = new EventsBuffer<EventsList>()
+    this.#eventsBuffer = new EventsBuffer<EventsList>(() => this.restore())
 
     if (!events) {
       debug('faking all events')
diff --git a/src/events_buffer.ts b/src/events_buffer.ts
index a4ff159..4b63a03 100644
--- a/src/events_buffer.ts
+++ b/src/events_buffer.ts
@@ -38,6 +38,16 @@ export class EventsBuffer<EventsList extends Record<string | symbol | number, an
    */
   #events: BufferedEventsList<EventsList>[] = []
 
+  /**
+   * Function to call when disposing the buffer to restore
+   * the emitter to its original state
+   */
+  #restoreFn: () => void
+
+  constructor(restoreFn: () => void) {
+    this.#restoreFn = restoreFn
+  }
+
   /**
    * Track emitted event
    *
@@ -226,4 +236,8 @@ export class EventsBuffer<EventsList extends Record<string | symbol | number, an
   flush(): void {
     this.#events = []
   }
+
+  [Symbol.dispose](): void {
+    this.#restoreFn()
+  }
 }
diff --git a/tests/emitter/emit.spec.ts b/tests/emitter/emit.spec.ts
index 09dfa59..707ccf8 100644
--- a/tests/emitter/emit.spec.ts
+++ b/tests/emitter/emit.spec.ts
@@ -433,4 +433,25 @@ test.group('Emitter | fake', () => {
     assert.deepEqual(stack, [{ name: 'new:user', data: { id: 1 } }])
     assert.deepEqual(events.all(), [{ event: 'resend:email', data: { email: 'foo@bar.com' } }])
   })
+
+  test('restore fakes using Symbol.dispose', async ({ assert }) => {
+    const stack: any[] = []
+
+    const app = new Application(BASE_URL, { environment: 'web' })
+    const emitter = new Emitter<{ 'new:user': { id: number } }>(app)
+
+    emitter.on('new:user', (data) => {
+      stack.push(data)
+    })
+
+    {
+      using events = emitter.fake(['new:user'])
+      await emitter.emit('new:user', { id: 1 })
+      assert.deepEqual(stack, [])
+      assert.deepEqual(events.all(), [{ event: 'new:user', data: { id: 1 } }])
+    }
+
+    await emitter.emit('new:user', { id: 2 })
+    assert.deepEqual(stack, [{ id: 2 }])
+  })
 })
diff --git a/tests/events_buffer.spec.ts b/tests/events_buffer.spec.ts
index ad86f89..9b977d3 100644
--- a/tests/events_buffer.spec.ts
+++ b/tests/events_buffer.spec.ts
@@ -16,7 +16,7 @@ test.group('Events buffer', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
 
     assert.deepEqual(events.all(), [{ event: 'new:user', data: { id: 1 } }])
@@ -33,7 +33,7 @@ test.group('Events buffer', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
     events.add('new:user', { id: 1 })
     events.add('new:user', { id: 2 })
@@ -46,7 +46,7 @@ test.group('Events buffer', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     assert.doesNotThrow(() => events.assertNoneEmitted())
     events.add('new:user', { id: 1 })
     assert.throws(
@@ -61,7 +61,7 @@ test.group('Events buffer | find', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
 
     const event = events.find('new:user')
@@ -78,7 +78,7 @@ test.group('Events buffer | find', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
     events.add('new:user', { id: 2 })
     events.add('new:user', { id: 3 })
@@ -100,7 +100,7 @@ test.group('Events buffer | find', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {}
     const userRegisteredEvent = new UserRegistered()
@@ -119,7 +119,7 @@ test.group('Events buffer | find', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {
       constructor(public id: number) {}
@@ -146,7 +146,7 @@ test.group('Events buffer | exist', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
 
     assert.isTrue(events.exists('new:user'))
@@ -156,7 +156,7 @@ test.group('Events buffer | exist', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
     events.add('new:user', { id: 2 })
     events.add('new:user', { id: 3 })
@@ -172,7 +172,7 @@ test.group('Events buffer | exist', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {}
     const userRegisteredEvent = new UserRegistered()
@@ -188,7 +188,7 @@ test.group('Events buffer | exist', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {
       constructor(public id: number) {}
@@ -215,7 +215,7 @@ test.group('Events buffer | assertEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
 
     assert.doesNotThrow(() => events.assertEmitted('new:user'))
@@ -229,7 +229,7 @@ test.group('Events buffer | assertEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
     events.add('new:user', { id: 2 })
     events.add('new:user', { id: 3 })
@@ -250,7 +250,7 @@ test.group('Events buffer | assertEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {}
     class ResendEmail {}
@@ -269,7 +269,7 @@ test.group('Events buffer | assertEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class ResendEmail {}
     class UserRegistered {
@@ -300,7 +300,7 @@ test.group('Events buffer | assertNotEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
 
     assert.throws(
@@ -314,7 +314,7 @@ test.group('Events buffer | assertNotEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
     events.add('new:user', { id: 2 })
     events.add('new:user', { id: 3 })
@@ -331,7 +331,7 @@ test.group('Events buffer | assertNotEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {}
     class ResendEmail {}
@@ -350,7 +350,7 @@ test.group('Events buffer | assertNotEmitted', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class ResendEmail {}
     class UserRegistered {
@@ -383,7 +383,7 @@ test.group('Events buffer | assertEmittedCount', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
     events.add('new:user', { id: 1 })
 
     assert.doesNotThrow(() => events.assertEmittedCount('new:user', 1))
@@ -397,7 +397,7 @@ test.group('Events buffer | assertEmittedCount', () => {
     const events = new EventsBuffer<{
       'new:user': { id: number }
       'resend:email': { email: string }
-    }>()
+    }>(() => {})
 
     class UserRegistered {}
     const userRegisteredEvent = new UserRegistered()