diff --git a/src/common/store.js b/src/common/store.js
index d68bb3214..9bbc3f71c 100644
--- a/src/common/store.js
+++ b/src/common/store.js
@@ -3,6 +3,12 @@ const Store = require('electron-store')
 
 const store = new Store()
 
+const defaultFlags = [
+  '--migrate',
+  '--enable-gc',
+  '--routing', 'dhtclient'
+]
+
 if (store.get('version', 0) < 5) {
   store.clear()
 
@@ -10,21 +16,17 @@ if (store.get('version', 0) < 5) {
   store.set('ipfsConfig', {
     type: 'go',
     path: '',
-    flags: ['--migrate=true', '--routing=dhtclient', '--enable-gc=true'],
+    flags: defaultFlags,
     keysize: 2048
   })
 
   store.set('version', 5)
 }
 
-if (store.get('version', 0) !== 6) {
-  store.set('ipfsConfig.flags', [
-    '--migrate',
-    '--enable-gc',
-    '--routing', 'dhtclient'
-  ])
+const flags = store.set('ipfsConfig.flags', [])
 
-  store.set('version', 6)
+if (flags.includes('--migrate=true') || flags.includes('--enable-gc=true')) {
+  store.set('ipfsConfig.flags', defaultFlags)
 }
 
 if (!store.get('language')) {