diff --git a/lib/client.js b/lib/client.js
index 367878ae..5105ca4c 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -28,6 +28,12 @@ function Client (broker, conn) {
   this.subscriptions = {}
   this.id = null
 
+  // we use two variables for the will
+  // because we store in _will while
+  // we are authenticating
+  this.will = null
+  this._will = null
+
   conn.client = this
 
   this.parser.client = this
diff --git a/package.json b/package.json
index 5233a247..2a41539d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aedes",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "description": "Stream-based MQTT broker",
   "main": "aedes.js",
   "types": "types/index.d.ts",