diff --git a/nodes/hue-device.html b/nodes/hue-device.html
index a8d2017..07405ae 100644
--- a/nodes/hue-device.html
+++ b/nodes/hue-device.html
@@ -22,11 +22,13 @@
             return this.name ? 'node_label_italic' : '';
         },
         oneditprepare() {
+            const dev = this.device;
             function getDevices() {
                 $.getJSON('zigbee-shepherd/hue?id=' + $('#node-input-shepherd').val(), data => {
+                    $('#node-input-device').html('');
                     Object.keys(data).forEach(index => {
                         const device = data[index];
-                        $('#node-input-device').append(`<option>${device.meta.name}</option>`);
+                        $('#node-input-device').append(`<option ${dev === device.meta.name ? 'selected' : ''}>${device.meta.name}</option>`);
                     });
                 });
             }