From ad1c39e19ce184c1b5259df90caf4a5f67e022eb Mon Sep 17 00:00:00 2001
From: Josep M Sobrepere <josepot@gmail.com>
Date: Tue, 9 Jun 2020 00:26:56 +0200
Subject: [PATCH] chore: improve useObservable implementation

---
 src/useObservable.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/useObservable.ts b/src/useObservable.ts
index b1e3151..e0251ce 100644
--- a/src/useObservable.ts
+++ b/src/useObservable.ts
@@ -20,16 +20,11 @@ const useObservable = <O, I>(
         ? undefined
         : setTimeout(setState, suspenseTime, initialValue)
 
-    const stopInitialState = () => {
-      if (!timeoutToken) return
-      timeoutToken = clearTimeout(timeoutToken) as undefined
-    }
-
     const subscription = delayUnsubscription(unsubscribeGraceTime)(
       source$,
     ).subscribe(nextState => {
       setState(nextState as any)
-      stopInitialState()
+      timeoutToken = timeoutToken && (clearTimeout(timeoutToken) as undefined)
     })
 
     return () => subscription.unsubscribe()