diff --git a/src/main/java/io/nats/client/impl/NatsMessageConsumer.java b/src/main/java/io/nats/client/impl/NatsMessageConsumer.java
index aa7987631..8e4f7a125 100644
--- a/src/main/java/io/nats/client/impl/NatsMessageConsumer.java
+++ b/src/main/java/io/nats/client/impl/NatsMessageConsumer.java
@@ -58,7 +58,8 @@ public void heartbeatError() {
             doSub();
         }
         catch (JetStreamApiException | IOException e) {
-            setupHbAlarmToTrigger();
+            pmm.resetTracking();
+            pmm.initOrResetHeartbeatTimer();
         }
     }
 
@@ -69,20 +70,10 @@ void doSub() throws JetStreamApiException, IOException {
                 finished.set(true);
             }
         };
-        try {
-            super.initSub(subscriptionMaker.subscribe(mh, userDispatcher, pmm, null));
-            repull();
-            stopped.set(false);
-            finished.set(false);
-        }
-        catch (JetStreamApiException | IOException e) {
-            setupHbAlarmToTrigger();
-        }
-    }
-
-    private void setupHbAlarmToTrigger() {
-        pmm.resetTracking();
-        pmm.initOrResetHeartbeatTimer();
+        super.initSub(subscriptionMaker.subscribe(mh, userDispatcher, pmm, null));
+        repull();
+        stopped.set(false);
+        finished.set(false);
     }
 
     @Override