diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index a2f8a0615817..977c73c39336 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -3228,6 +3228,9 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
         case WS_DISCOVERY_START:
             tr_info("Discovery start");
 
+            protocol_mac_reset(cur);
+            ws_llc_reset(cur);
+            lowpan_adaptation_interface_reset(cur->id);
             //Clear Pending Key Index State
             cur->ws_info->pending_key_index_info.state = NO_PENDING_PROCESS;
             cur->mac_parameters->mac_default_key_index = 0;
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
index c5b5de6ca8e8..43d1e39b1687 100644
--- a/source/Service_Libs/fhss/fhss_ws.c
+++ b/source/Service_Libs/fhss/fhss_ws.c
@@ -542,6 +542,8 @@ static int16_t fhss_ws_synch_state_set_callback(const fhss_api_t *api, fhss_stat
         fhss_stop_timer(fhss_structure, fhss_unicast_handler);
         fhss_stop_timer(fhss_structure, fhss_broadcast_handler);
         fhss_structure->ws->broadcast_timer_running = false;
+        fhss_structure->ws->is_on_bc_channel = false;
+        fhss_structure->ws->synchronization_time = 0;
     }
 
     fhss_structure->fhss_state = fhss_state;