diff --git a/lib/device-settings.js b/lib/device-settings.js
index 7cee681e8..f02310bae 100644
--- a/lib/device-settings.js
+++ b/lib/device-settings.js
@@ -14,15 +14,10 @@ class DeviceSettings {
     }
     for (let prop of _.keys(newSettings)) {
       if(this._settings[prop] !== newSettings[prop]) {
-        let updatePayload = {
-          key: prop,
-          value: newSettings[prop],
-          oldValue: this._settings[prop],
-        };
-        this._settings[prop] = newSettings[prop];
         // update setting only when there is updateSettings defined.
         if (this.onSettingsUpdate) {
-          await this.onSettingsUpdate(updatePayload);
+          await this.onSettingsUpdate(prop, newSettings[prop], this._settings[prop]);
+          this._settings[prop] = newSettings[prop];
         } else {
           log.errorAndThrow("Unable to update settings; onSettingsUpdate method not found");
         }