diff --git a/Firmware/Chameleon-Mini/Terminal/Commands.c b/Firmware/Chameleon-Mini/Terminal/Commands.c
index 80de7e3..6577768 100644
--- a/Firmware/Chameleon-Mini/Terminal/Commands.c
+++ b/Firmware/Chameleon-Mini/Terminal/Commands.c
@@ -80,6 +80,10 @@ CommandStatusIdType CommandSetUid(char* OutMessage, const char* InParam)
     for (uint8_t i=0; i<UidSize; i++) {
       UidBuffer[i] = RandomGetByte();
     }
+    /* If we are using an ISO15 tag, the first byte needs to be E0 by standard */
+    if (ActiveConfiguration.TagFamily == TAG_FAMILY_ISO15693) {
+      UidBuffer[0] = 0xE0;
+    }
 
   } else {
     /* Convert to Bytes */