OriginalSin
diff --git a/‎dist/titanium/pubnub.js
+5 b/‎dist/titanium/pubnub.js
+5
diff --git a/‎dist/titanium/pubnub.min.js
+2-2 b/‎dist/titanium/pubnub.min.js
+2-2
diff --git a/‎dist/web/pubnub.js
+5 b/‎dist/web/pubnub.js
+5
diff --git a/‎dist/web/pubnub.min.js
+2-2 b/‎dist/web/pubnub.min.js
+2-2
diff --git a/‎lib/core/components/subscription_manager.js
+5 b/‎lib/core/components/subscription_manager.js
+5
diff --git a/‎lib/core/components/subscription_manager.js.map
+1-1 b/‎lib/core/components/subscription_manager.js.map
+1-1
diff --git a/‎lib/networking/index.js.map
+1-1 b/‎lib/networking/index.js.map
+1-1
@@ -1677,6 +1677,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    key: '_registerHeartbeatTimer',
 	    value: function _registerHeartbeatTimer() {
 	      this._stopHeartbeatTimer();
+
+	      if (this._config.getHeartbeatInterval() === 0) {
+	        return;
+	      }
+
 	      this._performHeartbeatLoop();
 	      this._heartbeatTimer = setInterval(this._performHeartbeatLoop.bind(this), this._config.getHeartbeatInterval() * 1000);
 	    }
 
@@ -1699,6 +1699,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    key: '_registerHeartbeatTimer',
 	    value: function _registerHeartbeatTimer() {
 	      this._stopHeartbeatTimer();
+
+	      if (this._config.getHeartbeatInterval() === 0) {
+	        return;
+	      }
+
 	      this._performHeartbeatLoop();
 	      this._heartbeatTimer = setInterval(this._performHeartbeatLoop.bind(this), this._config.getHeartbeatInterval() * 1000);
 	    }