diff --git a/libraries/ESP_NOW/src/ESP32_NOW.cpp b/libraries/ESP_NOW/src/ESP32_NOW.cpp
index 6fd3ff0a0b1..28670aaf403 100644
--- a/libraries/ESP_NOW/src/ESP32_NOW.cpp
+++ b/libraries/ESP_NOW/src/ESP32_NOW.cpp
@@ -239,15 +239,15 @@ int ESP_NOW_Class::getEncryptedPeerCount() {
 }
 
 int ESP_NOW_Class::availableForWrite() {
-  return ESP_NOW_MAX_DATA_LEN;
+  return ESP_NOW_MAX_DATA_LEN_V2;
 }
 
 size_t ESP_NOW_Class::write(const uint8_t *data, size_t len) {
   if (!_esp_now_has_begun) {
     return 0;
   }
-  if (len > ESP_NOW_MAX_DATA_LEN) {
-    len = ESP_NOW_MAX_DATA_LEN;
+  if (len > ESP_NOW_MAX_DATA_LEN_V2) {
+    len = ESP_NOW_MAX_DATA_LEN_V2;
   }
   esp_err_t result = esp_now_send(NULL, data, len);
   if (result == ESP_OK) {
@@ -386,8 +386,8 @@ size_t ESP_NOW_Peer::send(const uint8_t *data, int len) {
     log_e("Peer not added.");
     return 0;
   }
-  if (len > ESP_NOW_MAX_DATA_LEN) {
-    len = ESP_NOW_MAX_DATA_LEN;
+  if (len > ESP_NOW_MAX_DATA_LEN_V2) {
+    len = ESP_NOW_MAX_DATA_LEN_V2;
   }
   esp_err_t result = esp_now_send(mac, data, len);
   if (result == ESP_OK) {
diff --git a/libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp b/libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp
index 5603da2ba13..e454f369d1a 100644
--- a/libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp
+++ b/libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp
@@ -164,7 +164,7 @@ void ESP_NOW_Serial_Class::onReceive(const uint8_t *data, size_t len, bool broad
 
 //Print
 int ESP_NOW_Serial_Class::availableForWrite() {
-  //return ESP_NOW_MAX_DATA_LEN;
+  //return ESP_NOW_MAX_DATA_LEN_V2;
   if (tx_ring_buf == NULL) {
     return 0;
   }
@@ -189,7 +189,7 @@ bool ESP_NOW_Serial_Class::checkForTxData() {
   //do we have something that failed the last time?
   resend_count = 0;
   if (queued_buff == NULL) {
-    queued_buff = (uint8_t *)xRingbufferReceiveUpTo(tx_ring_buf, &queued_size, 0, ESP_NOW_MAX_DATA_LEN);
+    queued_buff = (uint8_t *)xRingbufferReceiveUpTo(tx_ring_buf, &queued_size, 0, ESP_NOW_MAX_DATA_LEN_V2);
   } else {
     log_d(MACSTR " : PREVIOUS", MAC2STR(addr()));
   }