diff --git a/src/index.ts b/src/index.ts
index def98a8..34729b2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -99,7 +99,7 @@ class StreamSub<T> implements Subscription {
   constructor(private _stream: Stream<T>, private _listener: InternalListener<T>) { }
 
   unsubscribe(): void {
-    this._stream._remove(this._listener);
+    this._stream._remove(this._listener, true);
   }
 }
 
@@ -1151,7 +1151,7 @@ export class Stream<T> implements InternalListener<T> {
     }
   }
 
-  _remove(il: InternalListener<T>): void {
+  _remove(il: InternalListener<T>, async: boolean = false): void {
     const ta = this._target;
     if (ta) return ta._remove(il);
     const a = this._ils;
@@ -1160,7 +1160,11 @@ export class Stream<T> implements InternalListener<T> {
       a.splice(i, 1);
       if (this._prod !== NO && a.length <= 0) {
         this._err = NO;
-        this._stopID = setTimeout(() => this._stopNow());
+        if (async) {
+          this._stopID = setTimeout(() => this._stopNow());
+        } else {
+          this._stopNow();
+        }
       } else if (a.length === 1) {
         this._pruneCycles();
       }
@@ -1216,7 +1220,7 @@ export class Stream<T> implements InternalListener<T> {
    * @param {Listener<T>} listener
    */
   removeListener(listener: Partial<Listener<T>>): void {
-    this._remove(listener as InternalListener<T>);
+    this._remove(listener as InternalListener<T>, true);
   }
 
   /**