diff --git a/clientapp/helpers/xmppEventHandlers.js b/clientapp/helpers/xmppEventHandlers.js
index aa40ff2..3c6be47 100644
--- a/clientapp/helpers/xmppEventHandlers.js
+++ b/clientapp/helpers/xmppEventHandlers.js
@@ -136,6 +136,10 @@ module.exports = function (client, app) {
 
             me.mucs.fetch();
         });
+
+        var keepalive;
+        keepalive = JSON.parse(localStorage.keepalive || '{}');
+        client.enableKeepAlive(keepalive);
     });
 
     client.on('roster:update', function (iq) {
diff --git a/package.json b/package.json
index e4d91df..0996902 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "otalk.im",
-    "version": "0.0.24",
+    "version": "0.0.25",
     "description": "Otalk: WebRTC Enabled XMPP Client, in the Browser",
     "repository": {
         "type": "git",
@@ -28,7 +28,7 @@
         "oembed": "0.1.0",
         "semi-static": "0.0.4",
         "sound-effect-manager": "0.0.5",
-        "stanza.io": "3.0.6",
+        "stanza.io": "3.1.1",
         "staydown": "1.0.3",
         "templatizer": "0.1.2",
         "underscore": "1.5.1",