diff --git a/src/gdbserver/gdb-server.c b/src/gdbserver/gdb-server.c
index e2a70e9ea..223514a3c 100644
--- a/src/gdbserver/gdb-server.c
+++ b/src/gdbserver/gdb-server.c
@@ -1640,6 +1640,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                             break;
                         }
                     }
+                    break;
 
                     default:
                         reply = strdup("");
@@ -1662,6 +1663,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                     case '4' : // remove access watchpoint
                         if(delete_data_watchpoint(sl, addr) < 0) {
                             reply = strdup("E00");
+                            break;
                         } else {
                             reply = strdup("OK");
                             break;