diff --git a/esp-wifi/src/wifi/mod.rs b/esp-wifi/src/wifi/mod.rs
index 982e4e0d8ba..f6e798a0e9d 100644
--- a/esp-wifi/src/wifi/mod.rs
+++ b/esp-wifi/src/wifi/mod.rs
@@ -986,7 +986,11 @@ impl Device for WifiDevice<'_> {
     fn capabilities(&self) -> smoltcp::phy::DeviceCapabilities {
         let mut caps = DeviceCapabilities::default();
         caps.max_transmission_unit = MTU;
-        caps.max_burst_size = Some(crate::CONFIG.max_burst_size);
+        caps.max_burst_size = if crate::CONFIG.max_burst_size == 0 {
+            None
+        } else {
+            Some(crate::CONFIG.max_burst_size)
+        };
         caps
     }
 }
@@ -1350,7 +1354,11 @@ pub(crate) mod embassy {
         fn capabilities(&self) -> Capabilities {
             let mut caps = Capabilities::default();
             caps.max_transmission_unit = MTU;
-            caps.max_burst_size = Some(1);
+            caps.max_burst_size = if crate::CONFIG.max_burst_size == 0 {
+                None
+            } else {
+                Some(crate::CONFIG.max_burst_size)
+            };
             caps
         }