diff --git a/agents/meshcore.js b/agents/meshcore.js
index a0f03d8f..215cdbe0 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -991,6 +991,17 @@ function createMeshCore(agent) {
         s.end = onTunnelClosed;
         s.tunnel = this;
 
+        if (require('MeshAgent').idleTimeout != null)
+        {
+            s.setTimeout(require('MeshAgent').idleTimeout * 1000);
+            s.on('timeout', function ()
+            {
+                this.ping();
+                this.setTimeout(require('MeshAgent').idleTimeout * 1000);
+            });
+        }
+
+
         //sendConsoleText('onTunnelUpgrade - ' + this.tcpport + ' - ' + this.udpport);
 
         if (this.tcpport != null) {