diff --git a/src/OctaneTaskTerminatedListener.php b/src/OctaneOperationTerminatedListener.php
similarity index 64%
rename from src/OctaneTaskTerminatedListener.php
rename to src/OctaneOperationTerminatedListener.php
index df62e66..a3c1aa9 100644
--- a/src/OctaneTaskTerminatedListener.php
+++ b/src/OctaneOperationTerminatedListener.php
@@ -4,11 +4,11 @@
 
 use Laravel\Passport\TokenRepository;
 use Laravel\Passport\ClientRepository;
-use Laravel\Octane\Events\TaskTerminated;
+use Laravel\Octane\Contracts\OperationTerminated;
 
-class OctaneTaskTerminatedListener
+class OctaneOperationTerminatedListener
 {
-    public function handle(TaskTerminated $event): void
+    public function handle(OperationTerminated $event): void
     {
         $event->app->forgetInstance(TokenRepository::class);
         $event->app->forgetInstance(ClientRepository::class);
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 5cf23db..0ce4560 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -6,13 +6,19 @@
 use Laravel\Passport\TokenRepository;
 use Laravel\Passport\ClientRepository;
 use Laravel\Octane\Events\TaskTerminated;
+use Laravel\Octane\Events\TickTerminated;
+use Laravel\Octane\Events\RequestTerminated;
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 
 class ServiceProvider extends LaravelServiceProvider
 {
     public function boot(Dispatcher $events): void
     {
-        $events->listen(TaskTerminated::class, OctaneTaskTerminatedListener::class);
+        $events->listen([
+            TickTerminated::class,
+            TaskTerminated::class,
+            RequestTerminated::class,
+        ], OctaneOperationTerminatedListener::class);
     }
 
     public function register(): void