diff --git a/core/shared/src/main/scala/zio/Hub.scala b/core/shared/src/main/scala/zio/Hub.scala
index f3e93d21ac92..17bcb175e188 100644
--- a/core/shared/src/main/scala/zio/Hub.scala
+++ b/core/shared/src/main/scala/zio/Hub.scala
@@ -277,7 +277,7 @@ object Hub {
                   subscribers.add(subscription -> pollers)
                   strategy.unsafeCompletePollers(hub, subscribers, subscription, pollers)
                   if (shutdownFlag.get) ZIO.interrupt else promise.await
-                }.onInterrupt(Exit.succeed(unsafeRemove(pollers, promise)))
+                }.onInterrupt(ZIO.succeed(unsafeRemove(pollers, promise)))
               case a =>
                 strategy.unsafeOnHubEmptySpace(hub, subscribers)
                 Exit.succeed(a)
@@ -410,7 +410,7 @@ object Hub {
             unsafeOnHubEmptySpace(hub, subscribers)
             unsafeCompleteSubscribers(hub, subscribers)
             if (isShutDown.get) ZIO.interrupt else promise.await
-          }.onInterrupt(Exit.succeed(unsafeRemove(promise)))
+          }.onInterrupt(ZIO.succeed(unsafeRemove(promise)))
         }
 
       def shutdown(implicit trace: Trace): UIO[Unit] =