diff --git a/custom_components/mikrotik_router/mikrotik_controller.py b/custom_components/mikrotik_router/mikrotik_controller.py
index fc91e89..46e6b70 100644
--- a/custom_components/mikrotik_router/mikrotik_controller.py
+++ b/custom_components/mikrotik_router/mikrotik_controller.py
@@ -1805,7 +1805,7 @@ class MikrotikControllerData:
                     self.data["host"][uid]["host-name"] = uid
 
             # Resolve manufacturer
-            if vals["manufacturer"] == "detect" and vals["address"] != "unknown":
+            if vals["manufacturer"] == "detect" and vals["mac-address"] != "unknown":
                 try:
                     self.data["host"][uid][
                         "manufacturer"
@@ -1813,6 +1813,9 @@ class MikrotikControllerData:
                 except:
                     self.data["host"][uid]["manufacturer"] = ""
 
+            if vals["manufacturer"] == "detect":
+                self.data["host"][uid]["manufacturer"] = ""
+
     # ---------------------------
     #   process_accounting
     # ---------------------------