From 54086057e7ee35acb7d6e1d0abb35e7f0173a84a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Tue, 21 Apr 2026 15:28:03 +0200
Subject: [PATCH] fix merge

---
 esphome/core/application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index a6874aa697d..c07a1b82f2d 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -102,7 +102,7 @@ void Application::setup() {
 
         for (uint32_t j = 0; j <= i; j++) {
           // Update loop_component_start_time_ right before calling each component
-          this->loop_component_start_time_ = millis();
+          this->loop_component_start_time_ = MillisInternal::get();
           this->components_[j]->call();
           this->feed_wdt();
         }