diff --git a/app.js b/app.js
index e2fe09d..b24ad18 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,7 @@
 var fs = require('fs');
 var path = require('path');
 var storage = require('node-persist');
+var hap = require('HAP-NodeJS');
 var uuid = require('HAP-NodeJS').uuid;
 var Bridge = require('HAP-NodeJS').Bridge;
 var Accessory = require('HAP-NodeJS').Accessory;
@@ -17,8 +18,8 @@ if (!fs.existsSync(configPath)) {
     process.exit(1);
 }
 
-// Initialize persistent storage
-storage.initSync();
+// Initialize HAP-NodeJS
+hap.init();
 
 // Start by creating our Bridge which will host all loaded Accessories
 var bridge = new Bridge('HomeBridge', uuid.generate("HomeBridge"));
diff --git a/package.json b/package.json
index 564c097..760cb6b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "ad2usb": "git+https://github.com/alistairg/node-ad2usb.git#local",
     "carwingsjs": "0.0.x",
     "elkington": "kevinohara80/elkington",
-    "hap-nodejs": "git+https://github.com/nfarina/HAP-NodeJS#b1d5257",
+    "hap-nodejs": "git+https://github.com/nfarina/HAP-NodeJS#96414ff",
     "harmonyhubjs-client": "^1.1.4",
     "harmonyhubjs-discover": "git+https://github.com/swissmanu/harmonyhubjs-discover.git",
     "mdns": "^2.2.4",