diff --git a/components/panasonic_heatpump/panasonic_heatpump.cpp b/components/panasonic_heatpump/panasonic_heatpump.cpp
index 00b3daf..d450643 100644
--- a/components/panasonic_heatpump/panasonic_heatpump.cpp
+++ b/components/panasonic_heatpump/panasonic_heatpump.cpp
@@ -193,7 +193,7 @@ void PanasonicHeatpumpComponent::send_request(RequestType requestType) {
     break;
   };
 
-  if (requestType != RequestType::NONE) {
+  if (requestType != RequestType::NONE && requestType != RequestType::INITIAL) {
     // Update last request time when request was sent
     this->last_request_time_ = millis();
   }
@@ -247,9 +247,11 @@ void PanasonicHeatpumpComponent::read_request() {
       if (this->log_uart_msg_)
         PanasonicHelpers::log_uart_hex(UART_LOG_TX, this->request_message_, ',');
 
-      // Update last request time when request is complete
-      this->last_request_time_ = millis();
-      this->uart_client_timeout_exceeded_ = false;
+      if (this->request_message_[0] != 0x31) {
+        // Update last request time when request is complete
+        this->last_request_time_ = millis();
+        this->uart_client_timeout_exceeded_ = false;
+      }
     }
   }
 }