diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp
index 91aee0cea6..0e242f5e74 100644
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -87,6 +87,9 @@ void ESPHomeOTAComponent::setup() {
   // no wakes fire and loop() falls back to the self-disable safety net.
   esphome_fast_select_set_ota_listener_sock(esphome_lwip_get_sock(this->server_->get_fd()));
 #endif
+#ifdef USE_OTA_PARTITIONS
+  ota::get_running_app_position(this->running_app_offset_, this->running_app_size_);
+#endif
 }
 
 void ESPHomeOTAComponent::dump_config() {
@@ -102,11 +105,8 @@ void ESPHomeOTAComponent::dump_config() {
 #endif
 #ifdef USE_OTA_PARTITIONS
   ESP_LOGCONFIG(TAG, "  Partition access allowed");
-  uint32_t running_app_offset;
-  size_t running_app_size;
-  ota::get_running_app_position(running_app_offset, running_app_size);
-  ESP_LOGCONFIG(TAG, "  Running app:\n    Partition address: 0x%X\n    Used size: %d bytes", running_app_offset,
-                running_app_size);
+  ESP_LOGCONFIG(TAG, "  Running app:\n    Partition address: 0x%X\n    Used size: %zu bytes", this->running_app_offset_,
+                this->running_app_size_);
 #ifdef USE_ESP32
   ESP_LOGCONFIG(TAG, "  Partition table:");
   esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, NULL);
diff --git a/esphome/components/esphome/ota/ota_esphome.h b/esphome/components/esphome/ota/ota_esphome.h
index 9bed9240aa..c09ad843f8 100644
--- a/esphome/components/esphome/ota/ota_esphome.h
+++ b/esphome/components/esphome/ota/ota_esphome.h
@@ -93,6 +93,8 @@ class ESPHomeOTAComponent final : public ota::OTAComponent {
 #endif  // USE_OTA_PASSWORD
 #ifdef USE_OTA_PARTITIONS
   bool extended_proto_{false};
+  uint32_t running_app_offset_{0};
+  size_t running_app_size_{0};
 #endif
 
   socket::ListenSocket *server_{nullptr};
diff --git a/esphome/components/ota/ota_backend_esp_idf.cpp b/esphome/components/ota/ota_backend_esp_idf.cpp
index 85c430cac6..d09f4c48d4 100644
--- a/esphome/components/ota/ota_backend_esp_idf.cpp
+++ b/esphome/components/ota/ota_backend_esp_idf.cpp
@@ -25,8 +25,7 @@ std::unique_ptr<IDFOTABackend> make_ota_backend() { return make_unique<IDFOTABac
 OTAResponseTypes IDFOTABackend::begin(size_t image_size, ota::OTAType ota_type) {
   this->ota_type_ = ota_type;
   if (this->ota_type_ == ota::OTA_TYPE_UPDATE_PARTITION_TABLE) {
-    if (image_size > ESP_PARTITION_TABLE_SIZE || image_size > ESP_PARTITION_TABLE_MAX_LEN ||
-        image_size > OTA_BUFFER_SIZE) {
+    if (image_size > ESP_PARTITION_TABLE_MAX_LEN) {
       ESP_LOGE(TAG, "Wrong partition table size");
       return OTA_RESPONSE_ERROR_PARTITION_TABLE_VERIFY;
     }
@@ -236,7 +235,7 @@ OTAResponseTypes IDFOTABackend::update_partition_table() {
     }
   }
   if (!checksum_found) {
-    ESP_LOGE(TAG, "New partition table has no checksum", err);
+    ESP_LOGE(TAG, "New partition table has no checksum");
     return OTA_RESPONSE_ERROR_PARTITION_TABLE_VERIFY;
   }
 
@@ -300,7 +299,7 @@ OTAResponseTypes IDFOTABackend::update_partition_table() {
     return OTA_RESPONSE_ERROR_PARTITION_TABLE_VERIFY;
   }
 
-  ESP_LOGD(TAG, "Checks passed, starting partition table update");
+  ESP_LOGW(TAG, "Checks passed, starting partition table update. Don't remove power until it is completed!");
 
   // Deinitialize NVS to prevent unwanted flash writes
   nvs_flash_deinit();
@@ -330,14 +329,14 @@ OTAResponseTypes IDFOTABackend::update_partition_table() {
   }
 
   // Update the partition table
-  err = esp_ota_begin(this->partition_table_part_, this->image_size_, &this->update_handle_);
+  err = esp_ota_begin(this->partition_table_part_, ESP_PARTITION_TABLE_MAX_LEN, &this->update_handle_);
   if (err != ESP_OK) {
     esp_ota_abort(this->update_handle_);
     this->update_handle_ = 0;
     ESP_LOGE(TAG, "esp_ota_begin failed (err=0x%X) ", err);
     return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE;
   }
-  err = esp_ota_write(this->update_handle_, this->buf_, this->image_size_);
+  err = esp_ota_write(this->update_handle_, this->buf_, ESP_PARTITION_TABLE_MAX_LEN);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ota_write failed (err=0x%X) ", err);
     return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE;
@@ -348,6 +347,7 @@ OTAResponseTypes IDFOTABackend::update_partition_table() {
     ESP_LOGE(TAG, "esp_ota_end failed (err=0x%X) ", err);
     return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE;
   }
+  this->partition_table_part_ = nullptr;
   esp_partition_unload_all();
 
   // Write otadata to set the new boot partition
@@ -381,8 +381,7 @@ void get_running_app_position(uint32_t &offset, size_t &size) {
   static size_t running_app_size = 0;
   if (running_app_size == 0) {
     const esp_partition_t *running_app_part = esp_ota_get_running_partition();
-    running_app_size = ((running_app_size + running_app_part->erase_size - 1) / running_app_part->erase_size) *
-                       running_app_part->erase_size;
+    running_app_size = running_app_part->size;
     running_app_offset = running_app_part->address;
     const esp_partition_pos_t running_app_pos = {
         .offset = running_app_part->address,