diff --git a/src/default_settings.h b/src/default_settings.h
index efabd8972..0f5661112 100644
--- a/src/default_settings.h
+++ b/src/default_settings.h
@@ -218,7 +218,7 @@
 #endif
 
 #ifndef EMSESP_DEFAULT_ENTITY_FORMAT
-#define EMSESP_DEFAULT_ENTITY_FORMAT 1 // in MQTT discovery, use shortnames and not multiple (prefixed with base)
+#define EMSESP_DEFAULT_ENTITY_FORMAT 3 // in MQTT discovery, single instance, shortname, v3.6
 #endif
 
 // matches Web UI settings