diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index bcd901daa1..977f9e06a0 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -49,14 +49,13 @@ void Logger::write_header_(int level, const char *tag, int line) {
   if (current_task == main_task_) {
     this->printf_to_buffer_("%s[%s][%s:%03u]: ", color, letter, tag, line);
   } else {
-#if defined(USE_ESP32)
-    const char *thread_name = pcTaskGetName(current_task);
-#elif defined(USE_LIBRETINY)
-    const char *thread_name = pcTaskGetTaskName(current_task);
-#elif defined(USE_ZEPHYR)
-    const char *thread_name = k_thread_name_get(current_task);
-#else
     const char *thread_name = "";
+#if defined(USE_ESP32)
+    thread_name = pcTaskGetName(current_task);
+#elif defined(USE_LIBRETINY)
+    thread_name = pcTaskGetTaskName(current_task);
+#elif defined(USE_ZEPHYR)
+    thread_name = k_thread_name_get(current_task);
 #endif
     this->printf_to_buffer_("%s[%s][%s:%03u]%s[%s]%s: ", color, letter, tag, line,
                             ESPHOME_LOG_BOLD(ESPHOME_LOG_COLOR_RED), thread_name, color);
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index b09373bcde..c2ad0f641c 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -15,18 +15,23 @@
 #define ESPHOME_VARIANT "ESP32"
 
 // Feature flags
+#define USE_ALARM_CONTROL_PANEL
 #define USE_API
 #define USE_API_NOISE
 #define USE_API_PLAINTEXT
-#define USE_ALARM_CONTROL_PANEL
 #define USE_BINARY_SENSOR
 #define USE_BUTTON
 #define USE_CLIMATE
 #define USE_COVER
+#define USE_DATETIME
+#define USE_DATETIME_DATE
+#define USE_DATETIME_DATETIME
+#define USE_DATETIME_TIME
 #define USE_DEEP_SLEEP
 #define USE_EVENT
 #define USE_FAN
 #define USE_GRAPH
+#define USE_GRAPHICAL_DISPLAY_MENU
 #define USE_HOMEASSISTANT_TIME
 #define USE_JSON
 #define USE_LIGHT
@@ -37,10 +42,6 @@
 #define USE_MQTT
 #define USE_NEXTION_TFT_UPLOAD
 #define USE_NUMBER
-#define USE_DATETIME
-#define USE_DATETIME_DATE
-#define USE_DATETIME_TIME
-#define USE_DATETIME_DATETIME
 #define USE_OTA
 #define USE_OTA_PASSWORD
 #define USE_OTA_STATE_CALLBACK
@@ -60,7 +61,6 @@
 #define USE_VALVE
 #define USE_WIFI
 #define USE_WIFI_AP
-#define USE_GRAPHICAL_DISPLAY_MENU
 
 // Arduino-specific feature flags
 #ifdef USE_ARDUINO
@@ -78,17 +78,19 @@
 
 // ESP32-specific feature flags
 #ifdef USE_ESP32
+#define USE_BLUETOOTH_PROXY
+#define USE_ESP32_BLE
 #define USE_ESP32_BLE_CLIENT
 #define USE_ESP32_BLE_SERVER
 #define USE_ESP32_CAMERA
 #define USE_IMPROV
-#define USE_SOCKET_IMPL_BSD_SOCKETS
-#define USE_WIFI_11KV_SUPPORT
-#define USE_BLUETOOTH_PROXY
-#define USE_VOICE_ASSISTANT
 #define USE_MICROPHONE
+#define USE_PSRAM
+#define USE_SOCKET_IMPL_BSD_SOCKETS
 #define USE_SPEAKER
 #define USE_SPI
+#define USE_VOICE_ASSISTANT
+#define USE_WIFI_11KV_SUPPORT
 
 #ifdef USE_ARDUINO
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(2, 0, 5)