diff --git a/components/esp_common/include/esp_expression_with_stack.h b/components/esp_common/include/esp_expression_with_stack.h
index cd1e4765a..3c94f9d3e 100644
--- a/components/esp_common/include/esp_expression_with_stack.h
+++ b/components/esp_common/include/esp_expression_with_stack.h
@@ -15,6 +15,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
+#include "freertos/task.h"
 #include "esp_debug_helpers.h"
 #include "esp_log.h"
 
@@ -42,6 +43,10 @@ extern "C" {
         expression;                                                                 \
     }                                                                               \
     esp_switch_stack_exit(&backup);                                                 \
+    StaticTask_t *current = (StaticTask_t *)xTaskGetCurrentTaskHandle();            \
+    /* pxDummy6 is the stack base of current thread defined in TCB_t */             \
+    /* place the watchpoint on current task stack after function execution*/        \
+    vPortSetStackWatchpoint(current->pxDummy6);                                     \
     xSemaphoreGive(lock);                                                           \
 })
 
diff --git a/components/freertos/xtensa/include/freertos/portmacro.h b/components/freertos/xtensa/include/freertos/portmacro.h
index 5c2c5f8dc..979ffecab 100644
--- a/components/freertos/xtensa/include/freertos/portmacro.h
+++ b/components/freertos/xtensa/include/freertos/portmacro.h
@@ -386,6 +386,7 @@ extern void esp_vApplicationTickHook( void );
 
 void _xt_coproc_release(volatile void * coproc_sa_base);
 void vApplicationSleep( TickType_t xExpectedIdleTime );
+void vPortSetStackWatchpoint( void* pxStackStart );
 
 #define portSUPPRESS_TICKS_AND_SLEEP( idleTime ) vApplicationSleep( idleTime )
 
diff --git a/components/xtensa/expression_with_stack_xtensa.c b/components/xtensa/expression_with_stack_xtensa.c
index b61282427..dd5542b60 100644
--- a/components/xtensa/expression_with_stack_xtensa.c
+++ b/components/xtensa/expression_with_stack_xtensa.c
@@ -19,7 +19,7 @@
 StackType_t * esp_switch_stack_setup(StackType_t *stack, size_t stack_size)
 {
 #if CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK
-    esp_clear_watchpoint(0);
+    esp_clear_watchpoint(1);
     uint32_t watchpoint_place = ((uint32_t)stack + 32) & 0x1f ;
 #endif    
     StackType_t *top_of_stack =  (StackType_t *)&stack[0] +                  
@@ -36,7 +36,7 @@ StackType_t * esp_switch_stack_setup(StackType_t *stack, size_t stack_size)
     frame->a1 = (UBaseType_t)top_of_stack;
 
 #if CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK
-    esp_set_watchpoint(0, (uint8_t *)watchpoint_place, 32, ESP_WATCHPOINT_STORE);    
+    esp_set_watchpoint(1, (uint8_t *)watchpoint_place, 32, ESP_WATCHPOINT_STORE);    
 #endif
 
     return top_of_stack;