diff --git a/data/configuration.yaml b/data/configuration.yaml
index 3e453de2..3ed7c1ce 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -18,8 +18,3 @@ mqtt:
 serial:
   # Location of CC2531 USB sniffer
   port: /dev/ttyACM0
-
-# Advanced configuration
-advanced:
-  version: 1
-  pan_id: 0x1a62
diff --git a/lib/util/settings.js b/lib/util/settings.js
index aafd76a0..79def6b4 100644
--- a/lib/util/settings.js
+++ b/lib/util/settings.js
@@ -2,23 +2,9 @@ const YAWN = require('yawn-yaml/cjs');
 const fs = require('fs');
 const data = require('./data');
 const file = data.joinPath('configuration.yaml');
-const logger = require('./logger');
 
 let yawn = read();
 
-// Migrate configuration.
-if (!yawn.json.advanced) {
-    // 1: Add advanced section to configuration.yaml
-    logger.info('Migrating configuration.yaml to version 1...');
-    yawn.yaml += '\n\n' +
-        '# Advanced configuration\n' +
-        'advanced:\n' +
-        '  version: 1\n' +
-        '  pan_id: 0x1a62\n';
-
-    writeRead();
-}
-
 function writeRead() {
     write();
     yawn = read();
diff --git a/lib/zigbee.js b/lib/zigbee.js
index 59d94ebc..7ab88eda 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -4,10 +4,12 @@ const settings = require('./util/settings');
 const data = require('./util/data');
 const debug = require('debug')('zigbee2mqtt:zigbee');
 
+const advancedSettings = settings.get().advanced;
+
 const shepherdSettings = {
     net: {
-        panId: settings.get().advanced.pan_id,
-        channelList: [settings.get().advanced.hasOwnProperty('channel') ? settings.get().advanced.channel : 11],
+        panId: advancedSettings && advancedSettings.pan_id ? advancedSettings.pan_id : 0x1a62,
+        channelList: [advancedSettings && advancedSettings.channel ? advancedSettings.channel : 11],
     },
     dbPath: data.joinPath('database.db'),
 };