diff --git a/esphome/components/alarm_control_panel/alarm_control_panel.cpp b/esphome/components/alarm_control_panel/alarm_control_panel.cpp
index d7dd06b1aa..baa7094a8a 100644
--- a/esphome/components/alarm_control_panel/alarm_control_panel.cpp
+++ b/esphome/components/alarm_control_panel/alarm_control_panel.cpp
@@ -34,7 +34,9 @@ void AlarmControlPanel::publish_state(AlarmControlPanelState state) {
              LOG_STR_ARG(alarm_control_panel_state_to_string(prev_state)));
     this->current_state_ = state;
     this->state_callback_.call();
+#ifdef USE_ALARM_CONTROL_PANEL
     ControllerRegistry::notify_alarm_control_panel_update(this);
+#endif
     if (state == ACP_STATE_TRIGGERED) {
       this->triggered_callback_.call();
     } else if (state == ACP_STATE_ARMING) {
diff --git a/esphome/components/binary_sensor/binary_sensor.cpp b/esphome/components/binary_sensor/binary_sensor.cpp
index a41bdb032c..7c35ebe116 100644
--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -38,7 +38,9 @@ void BinarySensor::send_state_internal(bool new_state) {
   // Note that set_state_ de-dups and will only trigger callbacks if the state has actually changed
   if (this->set_state_(new_state)) {
     ESP_LOGD(TAG, "'%s': New state is %s", this->get_name().c_str(), ONOFF(new_state));
+#ifdef USE_BINARY_SENSOR
     ControllerRegistry::notify_binary_sensor_update(this);
+#endif
   }
 }
 
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index 8df81dcc69..0576674f3a 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -464,7 +464,9 @@ void Climate::publish_state() {
 
   // Send state to frontend
   this->state_callback_.call(*this);
+#ifdef USE_CLIMATE
   ControllerRegistry::notify_climate_update(this);
+#endif
   // Save state
   this->save_state_();
 }
diff --git a/esphome/components/cover/cover.cpp b/esphome/components/cover/cover.cpp
index b3285a34a4..4542f0300e 100644
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -170,7 +170,9 @@ void Cover::publish_state(bool save) {
   ESP_LOGD(TAG, "  Current Operation: %s", cover_operation_to_str(this->current_operation));
 
   this->state_callback_.call();
+#ifdef USE_COVER
   ControllerRegistry::notify_cover_update(this);
+#endif
 
   if (save) {
     CoverRestoreState restore{};
diff --git a/esphome/components/datetime/date_entity.cpp b/esphome/components/datetime/date_entity.cpp
index cc3993eb58..d5c63f5e0b 100644
--- a/esphome/components/datetime/date_entity.cpp
+++ b/esphome/components/datetime/date_entity.cpp
@@ -32,7 +32,9 @@ void DateEntity::publish_state() {
   this->set_has_state(true);
   ESP_LOGD(TAG, "'%s': Sending date %d-%d-%d", this->get_name().c_str(), this->year_, this->month_, this->day_);
   this->state_callback_.call();
+#ifdef USE_DATETIME_DATE
   ControllerRegistry::notify_date_update(this);
+#endif
 }
 
 DateCall DateEntity::make_call() { return DateCall(this); }
diff --git a/esphome/components/datetime/datetime_entity.cpp b/esphome/components/datetime/datetime_entity.cpp
index cdb5b555b5..56f4e3f7af 100644
--- a/esphome/components/datetime/datetime_entity.cpp
+++ b/esphome/components/datetime/datetime_entity.cpp
@@ -48,7 +48,9 @@ void DateTimeEntity::publish_state() {
   ESP_LOGD(TAG, "'%s': Sending datetime %04u-%02u-%02u %02d:%02d:%02d", this->get_name().c_str(), this->year_,
            this->month_, this->day_, this->hour_, this->minute_, this->second_);
   this->state_callback_.call();
+#ifdef USE_DATETIME_DATETIME
   ControllerRegistry::notify_datetime_update(this);
+#endif
 }
 
 DateTimeCall DateTimeEntity::make_call() { return DateTimeCall(this); }
diff --git a/esphome/components/datetime/time_entity.cpp b/esphome/components/datetime/time_entity.cpp
index 39533144e8..f06f962177 100644
--- a/esphome/components/datetime/time_entity.cpp
+++ b/esphome/components/datetime/time_entity.cpp
@@ -29,7 +29,9 @@ void TimeEntity::publish_state() {
   ESP_LOGD(TAG, "'%s': Sending time %02d:%02d:%02d", this->get_name().c_str(), this->hour_, this->minute_,
            this->second_);
   this->state_callback_.call();
+#ifdef USE_DATETIME_TIME
   ControllerRegistry::notify_time_update(this);
+#endif
 }
 
 TimeCall TimeEntity::make_call() { return TimeCall(this); }
diff --git a/esphome/components/event/event.cpp b/esphome/components/event/event.cpp
index 5bcac99154..ffc3cdaa39 100644
--- a/esphome/components/event/event.cpp
+++ b/esphome/components/event/event.cpp
@@ -23,7 +23,9 @@ void Event::trigger(const std::string &event_type) {
   this->last_event_type_ = found;
   ESP_LOGD(TAG, "'%s' Triggered event '%s'", this->get_name().c_str(), this->last_event_type_);
   this->event_callback_.call(event_type);
+#ifdef USE_EVENT
   ControllerRegistry::notify_event(this);
+#endif
 }
 
 void Event::set_event_types(const FixedVector<const char *> &event_types) {
diff --git a/esphome/components/fan/fan.cpp b/esphome/components/fan/fan.cpp
index c7377b7070..ee1962bf60 100644
--- a/esphome/components/fan/fan.cpp
+++ b/esphome/components/fan/fan.cpp
@@ -182,7 +182,9 @@ void Fan::publish_state() {
     ESP_LOGD(TAG, "  Preset Mode: %s", preset);
   }
   this->state_callback_.call();
+#ifdef USE_FAN
   ControllerRegistry::notify_fan_update(this);
+#endif
   this->save_state_();
 }
 
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index ed566783a4..0f6695d968 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -140,7 +140,9 @@ float LightState::get_setup_priority() const { return setup_priority::HARDWARE -
 
 void LightState::publish_state() {
   this->remote_values_callback_.call();
+#ifdef USE_LIGHT
   ControllerRegistry::notify_light_update(this);
+#endif
 }
 
 LightOutput *LightState::get_output() const { return this->output_; }
diff --git a/esphome/components/lock/lock.cpp b/esphome/components/lock/lock.cpp
index 3601552218..2cbef07ca6 100644
--- a/esphome/components/lock/lock.cpp
+++ b/esphome/components/lock/lock.cpp
@@ -54,7 +54,9 @@ void Lock::publish_state(LockState state) {
   this->rtc_.save(&this->state);
   ESP_LOGD(TAG, "'%s': Sending state %s", this->name_.c_str(), lock_state_to_string(state));
   this->state_callback_.call();
+#ifdef USE_LOCK
   ControllerRegistry::notify_lock_update(this);
+#endif
 }
 
 void Lock::add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); }
diff --git a/esphome/components/media_player/media_player.cpp b/esphome/components/media_player/media_player.cpp
index a16dfccfc2..878dcfe6f1 100644
--- a/esphome/components/media_player/media_player.cpp
+++ b/esphome/components/media_player/media_player.cpp
@@ -150,7 +150,9 @@ void MediaPlayer::add_on_state_callback(std::function<void()> &&callback) {
 
 void MediaPlayer::publish_state() {
   this->state_callback_.call();
+#ifdef USE_MEDIA_PLAYER
   ControllerRegistry::notify_media_player_update(this);
+#endif
 }
 
 }  // namespace media_player
diff --git a/esphome/components/number/number.cpp b/esphome/components/number/number.cpp
index 22463a4552..35e59ebdab 100644
--- a/esphome/components/number/number.cpp
+++ b/esphome/components/number/number.cpp
@@ -33,7 +33,9 @@ void Number::publish_state(float state) {
   this->state = state;
   ESP_LOGD(TAG, "'%s': Sending state %f", this->get_name().c_str(), state);
   this->state_callback_.call(state);
+#ifdef USE_NUMBER
   ControllerRegistry::notify_number_update(this);
+#endif
 }
 
 void Number::add_on_state_callback(std::function<void(float)> &&callback) {
diff --git a/esphome/components/select/select.cpp b/esphome/components/select/select.cpp
index ab3ac75a80..fc933c15ef 100644
--- a/esphome/components/select/select.cpp
+++ b/esphome/components/select/select.cpp
@@ -34,7 +34,9 @@ void Select::publish_state(size_t index) {
   ESP_LOGD(TAG, "'%s': Sending state %s (index %zu)", this->get_name().c_str(), option, index);
   // Callback signature requires std::string, create temporary for compatibility
   this->state_callback_.call(std::string(option), index);
+#ifdef USE_SELECT
   ControllerRegistry::notify_select_update(this);
+#endif
 }
 
 const char *Select::current_option() const { return this->has_state() ? this->option_at(this->active_index_) : ""; }
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index dff76c5e9b..ac70e457e0 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -132,7 +132,9 @@ void Sensor::internal_send_state_to_frontend(float state) {
   ESP_LOGD(TAG, "'%s': Sending state %.5f %s with %d decimals of accuracy", this->get_name().c_str(), state,
            this->get_unit_of_measurement_ref().c_str(), this->get_accuracy_decimals());
   this->callback_.call(state);
+#ifdef USE_SENSOR
   ControllerRegistry::notify_sensor_update(this);
+#endif
 }
 
 }  // namespace sensor
diff --git a/esphome/components/switch/switch.cpp b/esphome/components/switch/switch.cpp
index 93e3ff5b44..49954e6f06 100644
--- a/esphome/components/switch/switch.cpp
+++ b/esphome/components/switch/switch.cpp
@@ -63,7 +63,9 @@ void Switch::publish_state(bool state) {
 
   ESP_LOGD(TAG, "'%s': Sending state %s", this->name_.c_str(), ONOFF(this->state));
   this->state_callback_.call(this->state);
+#ifdef USE_SWITCH
   ControllerRegistry::notify_switch_update(this);
+#endif
 }
 bool Switch::assumed_state() { return false; }
 
diff --git a/esphome/components/text/text.cpp b/esphome/components/text/text.cpp
index 5761723dc9..3028cd85ea 100644
--- a/esphome/components/text/text.cpp
+++ b/esphome/components/text/text.cpp
@@ -17,7 +17,9 @@ void Text::publish_state(const std::string &state) {
     ESP_LOGD(TAG, "'%s': Sending state %s", this->get_name().c_str(), state.c_str());
   }
   this->state_callback_.call(state);
+#ifdef USE_TEXT
   ControllerRegistry::notify_text_update(this);
+#endif
 }
 
 void Text::add_on_state_callback(std::function<void(std::string)> &&callback) {
diff --git a/esphome/components/text_sensor/text_sensor.cpp b/esphome/components/text_sensor/text_sensor.cpp
index 5c790d5e76..c4a941408a 100644
--- a/esphome/components/text_sensor/text_sensor.cpp
+++ b/esphome/components/text_sensor/text_sensor.cpp
@@ -85,7 +85,9 @@ void TextSensor::internal_send_state_to_frontend(const std::string &state) {
   this->set_has_state(true);
   ESP_LOGD(TAG, "'%s': Sending state '%s'", this->name_.c_str(), state.c_str());
   this->callback_.call(state);
+#ifdef USE_TEXT_SENSOR
   ControllerRegistry::notify_text_sensor_update(this);
+#endif
 }
 
 }  // namespace text_sensor
diff --git a/esphome/components/update/update_entity.cpp b/esphome/components/update/update_entity.cpp
index 069d08459b..9ca2c35f81 100644
--- a/esphome/components/update/update_entity.cpp
+++ b/esphome/components/update/update_entity.cpp
@@ -32,7 +32,9 @@ void UpdateEntity::publish_state() {
 
   this->set_has_state(true);
   this->state_callback_.call();
+#ifdef USE_UPDATE
   ControllerRegistry::notify_update(this);
+#endif
 }
 
 }  // namespace update
diff --git a/esphome/components/valve/valve.cpp b/esphome/components/valve/valve.cpp
index 086d0e469f..0982892af3 100644
--- a/esphome/components/valve/valve.cpp
+++ b/esphome/components/valve/valve.cpp
@@ -148,7 +148,9 @@ void Valve::publish_state(bool save) {
   ESP_LOGD(TAG, "  Current Operation: %s", valve_operation_to_str(this->current_operation));
 
   this->state_callback_.call();
+#ifdef USE_VALVE
   ControllerRegistry::notify_valve_update(this);
+#endif
 
   if (save) {
     ValveRestoreState restore{};