diff --git a/client/cmdlf.c b/client/cmdlf.c
index cf607f2e4..49ee94ba5 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -865,9 +865,9 @@ int CmdLFfind(const char *Cmd) {
         // The improved noise detection will find Cotag.
         if (getSignalProperties()->isnoise) {
 
-#ifdef WITH_HITAG
-            if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
-#endif
+            if (IfPm3Hitag()) {
+                if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
+            }
             if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
 
             PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
@@ -956,9 +956,7 @@ static command_t CommandTable[] = {
     {"fdx",         CmdLFFdx,           AlwaysAvailable, "{ FDX-B RFIDs...             }"},
     {"gproxii",     CmdLFGuard,         AlwaysAvailable, "{ Guardall Prox II RFIDs...  }"},
     {"hid",         CmdLFHID,           AlwaysAvailable, "{ HID RFIDs...               }"},
-#ifdef WITH_HITAG
     {"hitag",       CmdLFHitag,         AlwaysAvailable, "{ Hitag CHIPs...             }"},
-#endif
     {"indala",      CmdLFINDALA,        AlwaysAvailable, "{ Indala RFIDs...            }"},
     {"io",          CmdLFIO,            AlwaysAvailable, "{ ioProx RFIDs...            }"},
     {"jablotron",   CmdLFJablotron,     AlwaysAvailable, "{ Jablotron RFIDs...         }"},
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 87b3cad1d..86eb3930a 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -695,13 +695,13 @@ static int CmdLFHitagDump(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",     CmdHelp,                   AlwaysAvailable, "This help" },
-    {"list",     CmdLFHitagList,            IfPm3Present,    "List Hitag trace history" },
-    {"info",     CmdLFHitagInfo,            AlwaysAvailable, "Tag information" },
-    {"reader",   CmdLFHitagReader,          AlwaysAvailable, "Act like a Hitag Reader" },
-    {"sim",      CmdLFHitagSim,             AlwaysAvailable, "Simulate Hitag transponder" },
-    {"sniff",    CmdLFHitagSniff,           AlwaysAvailable, "Eavesdrop Hitag communication" },
-    {"writer",   CmdLFHitagWriter,          AlwaysAvailable, "Act like a Hitag Writer" },
-    {"cc",       CmdLFHitagCheckChallenges, AlwaysAvailable, "Test all challenges" },
+    {"list",     CmdLFHitagList,            IfPm3Hitag,      "List Hitag trace history" },
+    {"info",     CmdLFHitagInfo,            IfPm3Hitag,      "Tag information" },
+    {"reader",   CmdLFHitagReader,          IfPm3Hitag,      "Act like a Hitag Reader" },
+    {"sim",      CmdLFHitagSim,             IfPm3Hitag,      "Simulate Hitag transponder" },
+    {"sniff",    CmdLFHitagSniff,           IfPm3Hitag,      "Eavesdrop Hitag communication" },
+    {"writer",   CmdLFHitagWriter,          IfPm3Hitag,      "Act like a Hitag Writer" },
+    {"cc",       CmdLFHitagCheckChallenges, IfPm3Hitag,      "Test all challenges" },
     { NULL, NULL, 0, NULL }
 };