diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION
index a0d4b9c1..aab06473 100644
--- a/components/esp8266/lib/VERSION
+++ b/components/esp8266/lib/VERSION
@@ -1,7 +1,7 @@
 gwen:
     core:       5550687
     net80211:   26ed10d
-    pp:         55451ec
+    pp:         8d4a9f8
     wpa:        4e2372f
     espnow:     eeb16c6
     wps:        4e2372f
diff --git a/components/esp8266/lib/libpp.a b/components/esp8266/lib/libpp.a
index 2d7b78c0..2f5617f2 100644
Binary files a/components/esp8266/lib/libpp.a and b/components/esp8266/lib/libpp.a differ
diff --git a/components/heap/port/esp8266/include/esp_heap_port.h b/components/heap/port/esp8266/include/esp_heap_port.h
index d820a6c4..7294612c 100644
--- a/components/heap/port/esp8266/include/esp_heap_port.h
+++ b/components/heap/port/esp8266/include/esp_heap_port.h
@@ -16,14 +16,26 @@
 
 #define _heap_caps_lock(_num)               \
 {                                           \
+    extern int esp_wifi_is_sniffer(void);   \
     extern void vPortETSIntrLock(void);     \
-    vPortETSIntrLock();                     \
+    extern void vPortEnterCritical(void);   \
+                                            \
+    if (esp_wifi_is_sniffer())              \
+        vPortETSIntrLock();                 \
+    else                                    \
+        vPortEnterCritical();               \
 }
 
 #define _heap_caps_unlock(_num)             \
 {                                           \
+    extern int esp_wifi_is_sniffer(void);   \
     extern void vPortETSIntrUnlock(void);   \
-    vPortETSIntrUnlock();                   \
+    extern void vPortExitCritical(void);    \
+                                            \
+    if (esp_wifi_is_sniffer())              \
+        vPortETSIntrUnlock();               \
+    else                                    \
+        vPortExitCritical();                \
 }
 
 #define _heap_caps_feed_wdt(_num)           \