diff --git a/dist/persisted-state.js b/dist/persisted-state.js
index af4dc12..f68fb11 100644
--- a/dist/persisted-state.js
+++ b/dist/persisted-state.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _deepmerge=_interopRequireDefault(require("deepmerge")),_electronStore=_interopRequireDefault(require("electron-store"));function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function _defineProperties(a,b){for(var c,d=0;d<b.length;d++)c=b[d],c.enumerable=c.enumerable||!1,c.configurable=!0,"value"in c&&(c.writable=!0),Object.defineProperty(a,c.key,c)}function _createClass(a,b,c){return b&&_defineProperties(a.prototype,b),c&&_defineProperties(a,c),a}var STORAGE_NAME="vuex",STORAGE_KEY="state",STORAGE_TEST_KEY="test",PersistedState=function(){function a(b,c){_classCallCheck(this,a),this.options=b,this.store=c}return _createClass(a,[{key:"loadOptions",value:function a(){this.options.storage||(this.options.storage=this.createStorage()),this.options.storageKey||(this.options.storageKey=STORAGE_KEY),this.whitelist=this.loadFilter(this.options.whitelist,"whitelist"),this.blacklist=this.loadFilter(this.options.blacklist,"blacklist")}},{key:"createStorage",value:function a(){return new _electronStore.default({name:this.options.storageName||STORAGE_NAME})}},{key:"getState",value:function a(){return this.options.storage.get(this.options.storageKey)}},{key:"setState",value:function b(a){this.options.storage.set(this.options.storageKey,a)}},{key:"loadFilter",value:function c(a,b){if(!a)return null;if(a instanceof Array)return this.filterInArray(a);if("function"==typeof a)return a;throw new Error("[Vuex Electron] Filter \"".concat(b,"\" should be Array or Function. Please, read the docs."))}},{key:"filterInArray",value:function b(a){return function(b){return a.includes(b.type)}}},{key:"checkStorage",value:function a(){try{this.options.storage.set(STORAGE_TEST_KEY,STORAGE_TEST_KEY),this.options.storage.get(STORAGE_TEST_KEY),this.options.storage.delete(STORAGE_TEST_KEY)}catch(a){throw new Error("[Vuex Electron] Storage is not valid. Please, read the docs.")}}},{key:"combineMerge",value:function e(a,b,c){var d=function(a){return Array.isArray(a)?[]:{}},f=function(a,b){return(0,_deepmerge.default)(d(a),a,b)},g=a.slice();return b.forEach(function(b,d){if("undefined"==typeof g[d]){var e=!1!==c.clone,h=e&&c.isMergeableObject(b);g[d]=h?f(b,c):b}else c.isMergeableObject(b)?g[d]=(0,_deepmerge.default)(a[d],b,c):-1===a.indexOf(b)&&g.push(b)}),g}},{key:"loadInitialState",value:function b(){var a=this.getState(this.options.storage,this.options.storageKey);if(a){var c=(0,_deepmerge.default)(this.store.state,a,{arrayMerge:this.combineMerge});this.store.replaceState(c)}}},{key:"subscribeOnChanges",value:function b(){var a=this;this.store.subscribe(function(b,c){a.blacklist&&a.blacklist(b)||a.whitelist&&!a.whitelist(b)||a.setState(c)})}}]),a}(),_default=function(){var a=0<arguments.length&&arguments[0]!==void 0?arguments[0]:{};return function(b){var c=new PersistedState(a,b);c.loadOptions(),c.checkStorage(),c.loadInitialState(),c.subscribeOnChanges()}};exports.default=_default,module.exports=exports["default"];
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _deepmerge=_interopRequireDefault(require("deepmerge")),_electronStore=_interopRequireDefault(require("electron-store"));function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function _defineProperties(a,b){for(var c,d=0;d<b.length;d++)c=b[d],c.enumerable=c.enumerable||!1,c.configurable=!0,"value"in c&&(c.writable=!0),Object.defineProperty(a,c.key,c)}function _createClass(a,b,c){return b&&_defineProperties(a.prototype,b),c&&_defineProperties(a,c),a}var SET_STATE_THROTTLE=0,STORAGE_NAME="vuex",STORAGE_KEY="state",STORAGE_TEST_KEY="test",PersistedState=function(){function a(b,c){_classCallCheck(this,a),this.options=b,this.store=c}return _createClass(a,[{key:"loadOptions",value:function a(){this.options.storage||(this.options.storage=this.createStorage()),this.options.storageKey||(this.options.storageKey=STORAGE_KEY),this.options.throttle||(this.options.throttle=SET_STATE_THROTTLE),this.whitelist=this.loadFilter(this.options.whitelist,"whitelist"),this.blacklist=this.loadFilter(this.options.blacklist,"blacklist")}},{key:"createStorage",value:function a(){return new _electronStore.default({name:this.options.storageName||STORAGE_NAME})}},{key:"getState",value:function a(){return this.options.storage.get(this.options.storageKey)}},{key:"setState",value:function b(a){("test"===process.env.NODE_ENV||"browser"===process.type)&&this.options.storage.set(this.options.storageKey,a)}},{key:"loadFilter",value:function c(a,b){if(!a)return null;if(a instanceof Array)return this.filterInArray(a);if("function"==typeof a)return a;throw new Error("[Vuex Electron] Filter \"".concat(b,"\" should be Array or Function. Please, read the docs."))}},{key:"filterInArray",value:function b(a){return function(b){return a.includes(b.type)}}},{key:"checkStorage",value:function a(){try{this.options.storage.set(STORAGE_TEST_KEY,STORAGE_TEST_KEY),this.options.storage.get(STORAGE_TEST_KEY),this.options.storage.delete(STORAGE_TEST_KEY)}catch(a){throw new Error("[Vuex Electron] Storage is not valid. Please, read the docs.")}}},{key:"combineMerge",value:function e(a,b,c){var d=function(a){return Array.isArray(a)?[]:{}},f=function(a,b){return(0,_deepmerge.default)(d(a),a,b)},g=a.slice();return b.forEach(function(b,d){if("undefined"==typeof g[d]){var e=!1!==c.clone,h=e&&c.isMergeableObject(b);g[d]=h?f(b,c):b}else c.isMergeableObject(b)?g[d]=(0,_deepmerge.default)(a[d],b,c):-1===a.indexOf(b)&&g.push(b)}),g}},{key:"loadInitialState",value:function b(){var a=this.getState(this.options.storage,this.options.storageKey);if(a){var c=(0,_deepmerge.default)(this.store.state,a,{arrayMerge:this.combineMerge});this.store.replaceState(c)}}},{key:"subscribeOnChanges",value:function d(){var a=this,b=0,c=-1;this.store.subscribe(function(d,e){if(!(a.blacklist&&a.blacklist(d))&&(!a.whitelist||a.whitelist(d)))if(a.options.throttle){var f=Date.now();!b||f>b+a.options.throttle?(b=f,a.setState(e)):(clearTimeout(c),c=setTimeout(function(){return a.setState(e)},a.options.throttle))}else a.setState(e)})}}]),a}(),_default=function(){var a=0<arguments.length&&arguments[0]!==void 0?arguments[0]:{};return function(b){var c=new PersistedState(a,b);c.loadOptions(),c.checkStorage(),c.loadInitialState(),c.subscribeOnChanges()}};exports.default=_default,module.exports=exports["default"];
\ No newline at end of file
diff --git a/package.json b/package.json
index 5e2d7b2..f34c294 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,6 @@
   },
   "dependencies": {
     "deepmerge": "^2.1.1",
-    "electron-store": "^2.0.0"
+    "electron-store": "^8.0.1"
   }
 }
diff --git a/src/persisted-state.js b/src/persisted-state.js
index 69a014e..7f15819 100644
--- a/src/persisted-state.js
+++ b/src/persisted-state.js
@@ -1,6 +1,7 @@
 import merge from "deepmerge"
 import Store from "electron-store"
 
+const SET_STATE_THROTTLE = 0
 const STORAGE_NAME = "vuex"
 const STORAGE_KEY = "state"
 const STORAGE_TEST_KEY = "test"
@@ -14,6 +15,7 @@ class PersistedState {
   loadOptions() {
     if (!this.options.storage) this.options.storage = this.createStorage()
     if (!this.options.storageKey) this.options.storageKey = STORAGE_KEY
+    if (!this.options.throttle) this.options.throttle = SET_STATE_THROTTLE
 
     this.whitelist = this.loadFilter(this.options.whitelist, "whitelist")
     this.blacklist = this.loadFilter(this.options.blacklist, "blacklist")
@@ -28,7 +30,9 @@ class PersistedState {
   }
 
   setState(state) {
-    this.options.storage.set(this.options.storageKey, state)
+    if (process.env.NODE_ENV === "test" || process.type === "browser") {
+      this.options.storage.set(this.options.storageKey, state)
+    }
   }
 
   loadFilter(filter, name) {
@@ -89,11 +93,24 @@ class PersistedState {
   }
 
   subscribeOnChanges() {
+    let lastSetStateDate = 0
+    let trailingEventTimeout = -1
+
     this.store.subscribe((mutation, state) => {
       if (this.blacklist && this.blacklist(mutation)) return
       if (this.whitelist && !this.whitelist(mutation)) return
-
-      this.setState(state)
+      if (this.options.throttle) {
+        const now = Date.now()
+        if (!lastSetStateDate || now > lastSetStateDate + this.options.throttle) {
+          lastSetStateDate = now
+          this.setState(state)
+        } else {
+          clearTimeout(trailingEventTimeout)
+          trailingEventTimeout = setTimeout(() => this.setState(state), this.options.throttle)
+        }
+      } else {
+        this.setState(state)
+      }
     })
   }
 }