diff --git a/lib/Endpoint.js b/lib/Endpoint.js
index 4d86ab7..82fa346 100644
--- a/lib/Endpoint.js
+++ b/lib/Endpoint.js
@@ -74,9 +74,10 @@ _.extend(Endpoint.prototype, require('events').EventEmitter.prototype, {
     this.socket.on('data', this.onData);
     this.socket.on('close', this.onClose);
     this.socket.on('error', this.onError);
+
     this.socket.setTimeout(0);
-    this.socket.setNoDelay();
-    this.socket.setKeepAlive(true);
+    this.socket.setKeepAlive(true, 30);
+    this.socket.setNoDelay(true);
   },
 
   reconnect:function(number, delay){
diff --git a/package.json b/package.json
index af00db3..199c916 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "redsmin",
   "description": "Redsmin daemon for the Redsmin service",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "keywords": [
     "redis",
     "redsmin",