diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 4f6f161..7a07678 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -855,6 +855,9 @@ update_watchpoint (struct breakpoint *b, int reparse)
 
   value_free (b->val);
   b->val = NULL;
+
+  if (b->disposition == disp_del_at_next_stop)
+    return;
  
   /* Save the current frame's ID so we can restore it after
      evaluating the watchpoint expression on its own frame.  */