diff --git a/lib/extension/deviceConfigure.js b/lib/extension/deviceConfigure.js
index a1ddd05f6..6de8bbbd5 100644
--- a/lib/extension/deviceConfigure.js
+++ b/lib/extension/deviceConfigure.js
@@ -13,7 +13,7 @@ class DeviceConfigure extends BaseExtension {
     }
 
     shouldConfigure(device, mappedDevice) {
-        if (!device || !mappedDevice) {
+        if (!device || !mappedDevice || !mappedDevice.configure) {
             return false;
         }
 
@@ -23,10 +23,6 @@ class DeviceConfigure extends BaseExtension {
             return false;
         }
 
-        if (!mappedDevice || !mappedDevice.configure) {
-            return false;
-        }
-
         if (device.interviewing === true) {
             return false;
         }