diff --git a/esphome/core/component_iterator.cpp b/esphome/core/component_iterator.cpp
index da593340c1..03c8fb44f9 100644
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@@ -375,7 +375,7 @@ void ComponentIterator::advance() {
   }
 
   if (advance_platform) {
-    this->state_ = static_cast<IteratorState>(static_cast<uint32_t>(this->state_) + 1);
+    this->state_ = static_cast<IteratorState>(static_cast<uint16_t>(this->state_) + 1);
     this->at_ = 0;
   } else if (success) {
     this->at_++;
diff --git a/esphome/core/component_iterator.h b/esphome/core/component_iterator.h
index 9e187f6c57..c7cebfd178 100644
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -93,7 +93,7 @@ class ComponentIterator {
   virtual bool on_end();
 
  protected:
-  enum class IteratorState {
+  enum class IteratorState : uint8_t {
     NONE = 0,
     BEGIN,
 #ifdef USE_BINARY_SENSOR
@@ -167,7 +167,7 @@ class ComponentIterator {
 #endif
     MAX,
   } state_{IteratorState::NONE};
-  size_t at_{0};
+  uint16_t at_{0};
   bool include_internal_{false};
 };