diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js
index de9787755b2e2dba5863ea530363c7c5472a1457..0cdba21a4795a9e4be5ed7f15ad933251873e198 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js
@@ -75,7 +75,11 @@ var BarcodeUtil = new function() {
                         codeReader.listVideoInputDevices().then((videoInputDevices) => {
                             // Add cameras to devices
                             for(var cIdx = 0; cIdx < videoInputDevices.length; cIdx++) {
-                                var $cameraInput = $("<input>", { id : "camera-" + (cIdx+1), name : "device", type : "radio", value : videoInputDevices[cIdx].deviceId });
+                                var cameraDeviceId = videoInputDevices[cIdx].deviceId;
+                                if(!cameraDeviceId) {
+                                    cameraDeviceId = "trust";
+                                }
+                                var $cameraInput = $("<input>", { id : "camera-" + (cIdx+1), name : "device", type : "radio", value : cameraDeviceId });
                                         $device.append($cameraInput);
                                         deviceInputs.push($cameraInput);
                                         $device.append($("<label>", { for : "camera-" + (cIdx+1),  onclick : "" }).append(videoInputDevices[cIdx].label));
@@ -190,7 +194,9 @@ var BarcodeUtil = new function() {
                             action(null, err);
                         }
                     };
-
+                    if(cameraDeviceId === "trust") {
+                        cameraDeviceId = null;
+                    }
                     codeReader.decodeFromVideoDevice(cameraDeviceId, 'video', decodeFromVideoDeviceCallback);
         });
     }