diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
index 128268353..69b175af0 100644
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -116,7 +116,9 @@ class AtomApplication extends EventEmitter {
 
     this.configFile = new ConfigFile(configFilePath)
     this.config = new Config({
-      saveCallback: settings => this.configFile.update(settings)
+      saveCallback: settings => {
+        if (!this.quitting) return this.configFile.update(settings)
+      }
     })
     this.config.setSchema(null, {type: 'object', properties: _.clone(ConfigSchema)})