diff --git a/app.js b/app.js
index 5a761d1017c03cc46ea66df0d37a584d9a360cd9..6c2eb6ed2bb8195a2a687d7b6de809076f9b6ee2 100644
--- a/app.js
+++ b/app.js
@@ -725,13 +725,23 @@ var firmwarewizard = function() {
     }
   }
 
+  function hasVendorDevicesForEnabledDeviceCategories(vendor) {
+    var image_vendors = Object.keys(images);
+    for (let [key, value] of Object.entries(images[vendor])) {
+      if (enabled_device_categories.includes(value[0].category)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   function getVendors() {
     var vendorlist = [];
     for (var device_category_idx in enabled_device_categories) {
       var device_category = enabled_device_categories[device_category_idx];
       var category_vendors = Object.keys(config.vendormodels[device_category]);
       category_vendors.forEach(function (val, idx) {
-        if (!vendorlist.includes(val)) {
+        if (!vendorlist.includes(val) && hasVendorDevicesForEnabledDeviceCategories(val)) {
           vendorlist.push(val);
         }
       });