diff --git a/lib/devices.js b/lib/devices.js
index 43f2eb24..26760616 100644
--- a/lib/devices.js
+++ b/lib/devices.js
@@ -1,5 +1,13 @@
 const homeassistant = require('./homeassistant').configurations;
 
+const LED1623G12 = {
+    model: 'LED1623G12',
+    vendor: 'IKEA',
+    description: 'TRADFRI LED bulb E27 1000 lumen, dimmable, opal white',
+    supports: 'on/off, brightness',
+    homeassistant: [homeassistant.light_brightness]
+};
+
 const devices = {
     // Xiaomi
     'lumi.sensor_switch': {
@@ -125,13 +133,9 @@ const devices = {
         supports: 'on/off, brightness, color temperature',
         homeassistant: [homeassistant.light_brightness_colortemp]
     },
-    'TRADFRI bulb E27 opal 1000lm': {
-        model: 'LED1623G12',
-        vendor: 'IKEA',
-        description: 'TRADFRI LED bulb E27 1000 lumen, dimmable, opal white',
-        supports: 'on/off, brightness',
-        homeassistant: [homeassistant.light_brightness]
-    },
+    // LED1623G12 uses 2 model IDs, see https://github.com/Koenkk/zigbee2mqtt/issues/21
+    'TRADFRI bulb E27 opal 1000lm': LED1623G12,
+    'TRADFRI bulb E27 W opal 1000lm': LED1623G12,
     'TRADFRI bulb GU10 WS 400lm': {
         model: 'LED1537R6',
         vendor: 'IKEA',
diff --git a/support/docgen.js b/support/docgen.js
index 1ff699a2..3d0f4d24 100644
--- a/support/docgen.js
+++ b/support/docgen.js
@@ -35,7 +35,7 @@ const logDevices = (devices) => {
     let result = '';
     result += '| Model | Description | Picture |\n';
     result += '| ------------- | ------------- | -------------------------- |\n';
-
+    devices = new Map(devices.map((d) => [d.model, d]));
     devices.forEach((device) => {
         result += `| ${device.model} | ${device.vendor} ${device.description} (${device.supports}) | ![${device.model}](images/devices/${device.model.replace('/', '-')}.jpg) |\n`;
     });