diff --git a/applications/main/gpio/gpio_app_i.h b/applications/main/gpio/gpio_app_i.h
index 85c5c332..8f805891 100644
--- a/applications/main/gpio/gpio_app_i.h
+++ b/applications/main/gpio/gpio_app_i.h
@@ -29,6 +29,7 @@ struct GpioApp {
     GpioTest* gpio_test;
     GpioUsbUart* gpio_usb_uart;
     UsbUartBridge* usb_uart_bridge;
+    UsbUartConfig* usb_uart_cfg;
 };
 
 typedef enum {
diff --git a/applications/main/gpio/gpio_custom_event.h b/applications/main/gpio/gpio_custom_event.h
index 2bf3e5a8..72b8fecc 100644
--- a/applications/main/gpio/gpio_custom_event.h
+++ b/applications/main/gpio/gpio_custom_event.h
@@ -9,4 +9,5 @@ typedef enum {
     GpioCustomEventErrorBack,
 
     GpioUsbUartEventConfig,
+    GpioUsbUartEventConfigSet,
 } GpioCustomEvent;
diff --git a/applications/main/gpio/scenes/gpio_scene_usb_uart_config.c b/applications/main/gpio/scenes/gpio_scene_usb_uart_config.c
index c114d79a..55b04ed6 100644
--- a/applications/main/gpio/scenes/gpio_scene_usb_uart_config.c
+++ b/applications/main/gpio/scenes/gpio_scene_usb_uart_config.c
@@ -9,8 +9,6 @@ typedef enum {
     UsbUartLineIndexFlow,
 } LineIndex;
 
-static UsbUartConfig* cfg_set;
-
 static const char* vcp_ch[] = {"0 (CLI)", "1"};
 static const char* uart_ch[] = {"13,14", "15,16"};
 static const char* flow_pins[] = {"None", "2,3", "6,7", "16,15"};
@@ -28,8 +26,14 @@ static const uint32_t baudrate_list[] = {
 };
 
 bool gpio_scene_usb_uart_cfg_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
-    UNUSED(event);
+    GpioApp* app = context;
+    furi_assert(app);
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GpioUsbUartEventConfigSet) {
+            usb_uart_set_config(app->usb_uart_bridge, app->usb_uart_cfg);
+            return true;
+        }
+    }
     return false;
 }
 
@@ -38,55 +42,59 @@ void line_ensure_flow_invariant(GpioApp* app) {
     // selected. This function enforces that invariant by resetting flow_pins
     // to None if it is configured to 16,15 when LPUART is selected.
 
-    uint8_t available_flow_pins = cfg_set->uart_ch == FuriHalUartIdLPUART1 ? 3 : 4;
+    uint8_t available_flow_pins = app->usb_uart_cfg->uart_ch == FuriHalUartIdLPUART1 ? 3 : 4;
     VariableItem* item = app->var_item_flow;
     variable_item_set_values_count(item, available_flow_pins);
 
-    if(cfg_set->flow_pins >= available_flow_pins) {
-        cfg_set->flow_pins = 0;
-        usb_uart_set_config(app->usb_uart_bridge, cfg_set);
+    if(app->usb_uart_cfg->flow_pins >= available_flow_pins) {
+        app->usb_uart_cfg->flow_pins = 0;
 
-        variable_item_set_current_value_index(item, cfg_set->flow_pins);
-        variable_item_set_current_value_text(item, flow_pins[cfg_set->flow_pins]);
+        variable_item_set_current_value_index(item, app->usb_uart_cfg->flow_pins);
+        variable_item_set_current_value_text(item, flow_pins[app->usb_uart_cfg->flow_pins]);
     }
 }
 
 static void line_vcp_cb(VariableItem* item) {
     GpioApp* app = variable_item_get_context(item);
+    furi_assert(app);
     uint8_t index = variable_item_get_current_value_index(item);
 
     variable_item_set_current_value_text(item, vcp_ch[index]);
 
-    cfg_set->vcp_ch = index;
-    usb_uart_set_config(app->usb_uart_bridge, cfg_set);
+    app->usb_uart_cfg->vcp_ch = index;
+    view_dispatcher_send_custom_event(app->view_dispatcher, GpioUsbUartEventConfigSet);
 }
 
 static void line_port_cb(VariableItem* item) {
     GpioApp* app = variable_item_get_context(item);
+    furi_assert(app);
     uint8_t index = variable_item_get_current_value_index(item);
 
     variable_item_set_current_value_text(item, uart_ch[index]);
 
     if(index == 0)
-        cfg_set->uart_ch = FuriHalUartIdUSART1;
+        app->usb_uart_cfg->uart_ch = FuriHalUartIdUSART1;
     else if(index == 1)
-        cfg_set->uart_ch = FuriHalUartIdLPUART1;
-    usb_uart_set_config(app->usb_uart_bridge, cfg_set);
+        app->usb_uart_cfg->uart_ch = FuriHalUartIdLPUART1;
+
     line_ensure_flow_invariant(app);
+    view_dispatcher_send_custom_event(app->view_dispatcher, GpioUsbUartEventConfigSet);
 }
 
 static void line_flow_cb(VariableItem* item) {
     GpioApp* app = variable_item_get_context(item);
+    furi_assert(app);
     uint8_t index = variable_item_get_current_value_index(item);
 
     variable_item_set_current_value_text(item, flow_pins[index]);
 
-    cfg_set->flow_pins = index;
-    usb_uart_set_config(app->usb_uart_bridge, cfg_set);
+    app->usb_uart_cfg->flow_pins = index;
+    view_dispatcher_send_custom_event(app->view_dispatcher, GpioUsbUartEventConfigSet);
 }
 
 static void line_baudrate_cb(VariableItem* item) {
     GpioApp* app = variable_item_get_context(item);
+    furi_assert(app);
     uint8_t index = variable_item_get_current_value_index(item);
 
     char br_text[8];
@@ -94,28 +102,29 @@ static void line_baudrate_cb(VariableItem* item) {
     if(index > 0) {
         snprintf(br_text, 7, "%lu", baudrate_list[index - 1]);
         variable_item_set_current_value_text(item, br_text);
-        cfg_set->baudrate = baudrate_list[index - 1];
+        app->usb_uart_cfg->baudrate = baudrate_list[index - 1];
     } else {
         variable_item_set_current_value_text(item, baudrate_mode[index]);
-        cfg_set->baudrate = 0;
+        app->usb_uart_cfg->baudrate = 0;
     }
-    cfg_set->baudrate_mode = index;
-    usb_uart_set_config(app->usb_uart_bridge, cfg_set);
+    app->usb_uart_cfg->baudrate_mode = index;
+    view_dispatcher_send_custom_event(app->view_dispatcher, GpioUsbUartEventConfigSet);
 }
 
 void gpio_scene_usb_uart_cfg_on_enter(void* context) {
     GpioApp* app = context;
+    furi_assert(app);
     VariableItemList* var_item_list = app->var_item_list;
 
-    cfg_set = malloc(sizeof(UsbUartConfig));
-    usb_uart_get_config(app->usb_uart_bridge, cfg_set);
+    app->usb_uart_cfg = malloc(sizeof(UsbUartConfig));
+    usb_uart_get_config(app->usb_uart_bridge, app->usb_uart_cfg);
 
     VariableItem* item;
     char br_text[8];
 
     item = variable_item_list_add(var_item_list, "USB Channel", 2, line_vcp_cb, app);
-    variable_item_set_current_value_index(item, cfg_set->vcp_ch);
-    variable_item_set_current_value_text(item, vcp_ch[cfg_set->vcp_ch]);
+    variable_item_set_current_value_index(item, app->usb_uart_cfg->vcp_ch);
+    variable_item_set_current_value_text(item, vcp_ch[app->usb_uart_cfg->vcp_ch]);
 
     item = variable_item_list_add(
         var_item_list,
@@ -123,22 +132,23 @@ void gpio_scene_usb_uart_cfg_on_enter(void* context) {
         sizeof(baudrate_list) / sizeof(baudrate_list[0]) + 1,
         line_baudrate_cb,
         app);
-    variable_item_set_current_value_index(item, cfg_set->baudrate_mode);
-    if(cfg_set->baudrate_mode > 0) {
-        snprintf(br_text, 7, "%lu", baudrate_list[cfg_set->baudrate_mode - 1]);
+    variable_item_set_current_value_index(item, app->usb_uart_cfg->baudrate_mode);
+    if(app->usb_uart_cfg->baudrate_mode > 0) {
+        snprintf(br_text, 7, "%lu", baudrate_list[app->usb_uart_cfg->baudrate_mode - 1]);
         variable_item_set_current_value_text(item, br_text);
     } else {
-        variable_item_set_current_value_text(item, baudrate_mode[cfg_set->baudrate_mode]);
+        variable_item_set_current_value_text(
+            item, baudrate_mode[app->usb_uart_cfg->baudrate_mode]);
     }
 
     item = variable_item_list_add(var_item_list, "UART Pins", 2, line_port_cb, app);
-    variable_item_set_current_value_index(item, cfg_set->uart_ch);
-    variable_item_set_current_value_text(item, uart_ch[cfg_set->uart_ch]);
+    variable_item_set_current_value_index(item, app->usb_uart_cfg->uart_ch);
+    variable_item_set_current_value_text(item, uart_ch[app->usb_uart_cfg->uart_ch]);
 
     item = variable_item_list_add(
         var_item_list, "RTS/DTR Pins", COUNT_OF(flow_pins), line_flow_cb, app);
-    variable_item_set_current_value_index(item, cfg_set->flow_pins);
-    variable_item_set_current_value_text(item, flow_pins[cfg_set->flow_pins]);
+    variable_item_set_current_value_index(item, app->usb_uart_cfg->flow_pins);
+    variable_item_set_current_value_text(item, flow_pins[app->usb_uart_cfg->flow_pins]);
     app->var_item_flow = item;
     line_ensure_flow_invariant(app);
 
@@ -155,5 +165,5 @@ void gpio_scene_usb_uart_cfg_on_exit(void* context) {
         GpioAppViewUsbUartCfg,
         variable_item_list_get_selected_item_index(app->var_item_list));
     variable_item_list_reset(app->var_item_list);
-    free(cfg_set);
+    free(app->usb_uart_cfg);
 }
diff --git a/applications/main/gpio/usb_uart_bridge.c b/applications/main/gpio/usb_uart_bridge.c
index 927eedb0..1a82dbdc 100644
--- a/applications/main/gpio/usb_uart_bridge.c
+++ b/applications/main/gpio/usb_uart_bridge.c
@@ -3,6 +3,7 @@
 #include <furi_hal_usb_cdc.h>
 #include "usb_cdc.h"
 #include "cli/cli_vcp.h"
+#include <toolbox/api_lock.h>
 #include "cli/cli.h"
 
 #define USB_CDC_PKT_LEN CDC_DATA_SZ
@@ -51,6 +52,8 @@ struct UsbUartBridge {
 
     UsbUartState st;
 
+    FuriApiLock cfg_lock;
+
     uint8_t rx_buf[USB_CDC_PKT_LEN];
 };
 
@@ -244,6 +247,7 @@ static int32_t usb_uart_worker(void* context) {
                 usb_uart->cfg.flow_pins = usb_uart->cfg_new.flow_pins;
                 events |= WorkerEvtCtrlLineSet;
             }
+            api_lock_unlock(usb_uart->cfg_lock);
         }
         if(events & WorkerEvtLineCfgSet) {
             if(usb_uart->cfg.baudrate == 0)
@@ -352,8 +356,10 @@ void usb_uart_disable(UsbUartBridge* usb_uart) {
 void usb_uart_set_config(UsbUartBridge* usb_uart, UsbUartConfig* cfg) {
     furi_assert(usb_uart);
     furi_assert(cfg);
+    usb_uart->cfg_lock = api_lock_alloc_locked();
     memcpy(&(usb_uart->cfg_new), cfg, sizeof(UsbUartConfig));
     furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtCfgChange);
+    api_lock_wait_unlock_and_free(usb_uart->cfg_lock);
 }
 
 void usb_uart_get_config(UsbUartBridge* usb_uart, UsbUartConfig* cfg) {
diff --git a/applications/plugins/dap_link/dap_link.c b/applications/plugins/dap_link/dap_link.c
index 5c30e85c..eafb435e 100644
--- a/applications/plugins/dap_link/dap_link.c
+++ b/applications/plugins/dap_link/dap_link.c
@@ -247,7 +247,6 @@ static int32_t dap_process(void* p) {
 
     // deinit usb
     furi_hal_usb_set_config(usb_config_prev, NULL);
-    dap_common_wait_for_deinit();
     dap_common_usb_free_name();
     dap_deinit_gpio(swd_pins_prev);
     return 0;
diff --git a/applications/plugins/dap_link/usb/dap_v2_usb.c b/applications/plugins/dap_link/usb/dap_v2_usb.c
index 0c303a3b..b42df283 100644
--- a/applications/plugins/dap_link/usb/dap_v2_usb.c
+++ b/applications/plugins/dap_link/usb/dap_v2_usb.c
@@ -618,23 +618,12 @@ static void hid_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx) {
     if(dap_state.semaphore_v2 == NULL) dap_state.semaphore_v2 = furi_semaphore_alloc(1, 1);
     if(dap_state.semaphore_cdc == NULL) dap_state.semaphore_cdc = furi_semaphore_alloc(1, 1);
 
-    usb_hid.dev_descr->idVendor = DAP_HID_VID;
-    usb_hid.dev_descr->idProduct = DAP_HID_PID;
-
     usbd_reg_config(dev, hid_ep_config);
     usbd_reg_control(dev, hid_control);
 
     usbd_connect(dev, true);
 }
 
-static bool deinit_flag = false;
-
-void dap_common_wait_for_deinit() {
-    while(!deinit_flag) {
-        furi_delay_ms(50);
-    }
-}
-
 static void hid_deinit(usbd_device* dev) {
     dap_state.usb_dev = NULL;
 
@@ -647,12 +636,6 @@ static void hid_deinit(usbd_device* dev) {
 
     usbd_reg_config(dev, NULL);
     usbd_reg_control(dev, NULL);
-
-    free(usb_hid.str_manuf_descr);
-    free(usb_hid.str_prod_descr);
-
-    FURI_SW_MEMBARRIER();
-    deinit_flag = true;
 }
 
 static void hid_on_wakeup(usbd_device* dev) {
diff --git a/applications/plugins/dap_link/usb/dap_v2_usb.h b/applications/plugins/dap_link/usb/dap_v2_usb.h
index 2a0e8605..3f1534ff 100644
--- a/applications/plugins/dap_link/usb/dap_v2_usb.h
+++ b/applications/plugins/dap_link/usb/dap_v2_usb.h
@@ -51,5 +51,3 @@ void dap_common_usb_set_state_callback(DapStateCallback callback);
 void dap_common_usb_alloc_name(const char* name);
 
 void dap_common_usb_free_name();
-
-void dap_common_wait_for_deinit();
\ No newline at end of file
diff --git a/applications/services/dialogs/dialogs.c b/applications/services/dialogs/dialogs.c
index e2db4a0f..3c658888 100644
--- a/applications/services/dialogs/dialogs.c
+++ b/applications/services/dialogs/dialogs.c
@@ -1,6 +1,6 @@
 #include "dialogs/dialogs_message.h"
 #include "dialogs_i.h"
-#include "dialogs_api_lock.h"
+#include <toolbox/api_lock.h>
 #include "dialogs_module_file_browser.h"
 #include "dialogs_module_message.h"
 
@@ -35,7 +35,7 @@ static void dialogs_app_process_message(DialogsApp* app, DialogsAppMessage* mess
             dialogs_app_process_module_message(&message->data->dialog);
         break;
     }
-    API_LOCK_UNLOCK(message->lock);
+    api_lock_unlock(message->lock);
 }
 
 int32_t dialogs_srv(void* p) {
diff --git a/applications/services/dialogs/dialogs_api.c b/applications/services/dialogs/dialogs_api.c
index ee959a33..c1de5999 100644
--- a/applications/services/dialogs/dialogs_api.c
+++ b/applications/services/dialogs/dialogs_api.c
@@ -1,6 +1,6 @@
 #include "dialogs/dialogs_message.h"
 #include "dialogs_i.h"
-#include "dialogs_api_lock.h"
+#include <toolbox/api_lock.h>
 #include <assets_icons.h>
 
 /****************** File browser ******************/
@@ -10,7 +10,7 @@ bool dialog_file_browser_show(
     FuriString* result_path,
     FuriString* path,
     const DialogsFileBrowserOptions* options) {
-    FuriApiLock lock = API_LOCK_INIT_LOCKED();
+    FuriApiLock lock = api_lock_alloc_locked();
     furi_check(lock != NULL);
 
     DialogsAppData data = {
@@ -35,7 +35,7 @@ bool dialog_file_browser_show(
 
     furi_check(
         furi_message_queue_put(context->message_queue, &message, FuriWaitForever) == FuriStatusOk);
-    API_LOCK_WAIT_UNTIL_UNLOCK_AND_FREE(lock);
+    api_lock_wait_unlock_and_free(lock);
 
     return return_data.bool_value;
 }
@@ -43,7 +43,7 @@ bool dialog_file_browser_show(
 /****************** Message ******************/
 
 DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage* dialog_message) {
-    FuriApiLock lock = API_LOCK_INIT_LOCKED();
+    FuriApiLock lock = api_lock_alloc_locked();
     furi_check(lock != NULL);
 
     DialogsAppData data = {
@@ -61,7 +61,7 @@ DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage
 
     furi_check(
         furi_message_queue_put(context->message_queue, &message, FuriWaitForever) == FuriStatusOk);
-    API_LOCK_WAIT_UNTIL_UNLOCK_AND_FREE(lock);
+    api_lock_wait_unlock_and_free(lock);
 
     return return_data.dialog_value;
 }
diff --git a/applications/services/dialogs/dialogs_api_lock.h b/applications/services/dialogs/dialogs_api_lock.h
deleted file mode 100644
index a165803f..00000000
--- a/applications/services/dialogs/dialogs_api_lock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-typedef FuriEventFlag* FuriApiLock;
-
-#define API_LOCK_EVENT (1U << 0)
-
-#define API_LOCK_INIT_LOCKED() furi_event_flag_alloc();
-
-#define API_LOCK_WAIT_UNTIL_UNLOCK(_lock) \
-    furi_event_flag_wait(_lock, API_LOCK_EVENT, FuriFlagWaitAny, FuriWaitForever);
-
-#define API_LOCK_FREE(_lock) furi_event_flag_free(_lock);
-
-#define API_LOCK_UNLOCK(_lock) furi_event_flag_set(_lock, API_LOCK_EVENT);
-
-#define API_LOCK_WAIT_UNTIL_UNLOCK_AND_FREE(_lock) \
-    API_LOCK_WAIT_UNTIL_UNLOCK(_lock);             \
-    API_LOCK_FREE(_lock);
diff --git a/applications/services/dialogs/dialogs_message.h b/applications/services/dialogs/dialogs_message.h
index 91e040ce..d01c5aa9 100644
--- a/applications/services/dialogs/dialogs_message.h
+++ b/applications/services/dialogs/dialogs_message.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <furi.h>
 #include "dialogs_i.h"
-#include "dialogs_api_lock.h"
+#include <toolbox/api_lock.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/applications/services/dialogs/dialogs_module_file_browser.c b/applications/services/dialogs/dialogs_module_file_browser.c
index 166fd111..7e67d6c6 100644
--- a/applications/services/dialogs/dialogs_module_file_browser.c
+++ b/applications/services/dialogs/dialogs_module_file_browser.c
@@ -1,5 +1,5 @@
 #include "dialogs_i.h"
-#include "dialogs_api_lock.h"
+#include <toolbox/api_lock.h>
 #include "gui/modules/file_browser.h"
 
 typedef struct {
@@ -11,14 +11,14 @@ static void dialogs_app_file_browser_back_callback(void* context) {
     furi_assert(context);
     DialogsAppFileBrowserContext* file_browser_context = context;
     file_browser_context->result = false;
-    API_LOCK_UNLOCK(file_browser_context->lock);
+    api_lock_unlock(file_browser_context->lock);
 }
 
 static void dialogs_app_file_browser_callback(void* context) {
     furi_assert(context);
     DialogsAppFileBrowserContext* file_browser_context = context;
     file_browser_context->result = true;
-    API_LOCK_UNLOCK(file_browser_context->lock);
+    api_lock_unlock(file_browser_context->lock);
 }
 
 bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrowser* data) {
@@ -27,7 +27,7 @@ bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrow
 
     DialogsAppFileBrowserContext* file_browser_context =
         malloc(sizeof(DialogsAppFileBrowserContext));
-    file_browser_context->lock = API_LOCK_INIT_LOCKED();
+    file_browser_context->lock = api_lock_alloc_locked();
 
     ViewHolder* view_holder = view_holder_alloc();
     view_holder_attach_to_gui(view_holder, gui);
@@ -44,7 +44,7 @@ bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrow
 
     view_holder_set_view(view_holder, file_browser_get_view(file_browser));
     view_holder_start(view_holder);
-    API_LOCK_WAIT_UNTIL_UNLOCK(file_browser_context->lock);
+    api_lock_wait_unlock(file_browser_context->lock);
 
     ret = file_browser_context->result;
 
@@ -52,7 +52,7 @@ bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrow
     view_holder_free(view_holder);
     file_browser_stop(file_browser);
     file_browser_free(file_browser);
-    API_LOCK_FREE(file_browser_context->lock);
+    api_lock_free(file_browser_context->lock);
     free(file_browser_context);
     furi_record_close(RECORD_GUI);
 
diff --git a/applications/services/dialogs/dialogs_module_message.c b/applications/services/dialogs/dialogs_module_message.c
index 8d1c3ba7..879ba9ba 100644
--- a/applications/services/dialogs/dialogs_module_message.c
+++ b/applications/services/dialogs/dialogs_module_message.c
@@ -1,5 +1,5 @@
 #include "dialogs_i.h"
-#include "dialogs_api_lock.h"
+#include <toolbox/api_lock.h>
 #include <gui/modules/dialog_ex.h>
 
 typedef struct {
@@ -30,7 +30,7 @@ static void dialogs_app_message_back_callback(void* context) {
     furi_assert(context);
     DialogsAppMessageContext* message_context = context;
     message_context->result = DialogMessageButtonBack;
-    API_LOCK_UNLOCK(message_context->lock);
+    api_lock_unlock(message_context->lock);
 }
 
 static void dialogs_app_message_callback(DialogExResult result, void* context) {
@@ -49,7 +49,7 @@ static void dialogs_app_message_callback(DialogExResult result, void* context) {
     default:
         break;
     }
-    API_LOCK_UNLOCK(message_context->lock);
+    api_lock_unlock(message_context->lock);
 }
 
 DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDataDialog* data) {
@@ -57,7 +57,7 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
     Gui* gui = furi_record_open(RECORD_GUI);
     const DialogMessage* message = data->message;
     DialogsAppMessageContext* message_context = malloc(sizeof(DialogsAppMessageContext));
-    message_context->lock = API_LOCK_INIT_LOCKED();
+    message_context->lock = api_lock_alloc_locked();
 
     ViewHolder* view_holder = view_holder_alloc();
     view_holder_attach_to_gui(view_holder, gui);
@@ -87,14 +87,14 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
 
     view_holder_set_view(view_holder, dialog_ex_get_view(dialog_ex));
     view_holder_start(view_holder);
-    API_LOCK_WAIT_UNTIL_UNLOCK(message_context->lock);
+    api_lock_wait_unlock(message_context->lock);
 
     ret = message_context->result;
 
     view_holder_stop(view_holder);
     view_holder_free(view_holder);
     dialog_ex_free(dialog_ex);
-    API_LOCK_FREE(message_context->lock);
+    api_lock_free(message_context->lock);
     free(message_context);
     furi_record_close(RECORD_GUI);
 
diff --git a/firmware/targets/f7/furi_hal/furi_hal_memory.c b/firmware/targets/f7/furi_hal/furi_hal_memory.c
index 9cf2c312..ec71e666 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_memory.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_memory.c
@@ -81,6 +81,10 @@ void furi_hal_memory_init() {
 }
 
 void* furi_hal_memory_alloc(size_t size) {
+    if(FURI_IS_IRQ_MODE()) {
+        furi_crash("memmgt in ISR");
+    }
+
     if(furi_hal_memory == NULL) {
         return NULL;
     }
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb.c b/firmware/targets/f7/furi_hal/furi_hal_usb.c
index 1eaeffd6..e740155f 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_usb.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_usb.c
@@ -4,6 +4,7 @@
 #include <furi_hal_power.h>
 #include <stm32wbxx_ll_pwr.h>
 #include <furi.h>
+#include <toolbox/api_lock.h>
 
 #include "usb.h"
 
@@ -11,35 +12,67 @@
 
 #define USB_RECONNECT_DELAY 500
 
+typedef enum {
+    UsbApiEventTypeSetConfig,
+    UsbApiEventTypeGetConfig,
+    UsbApiEventTypeLock,
+    UsbApiEventTypeUnlock,
+    UsbApiEventTypeIsLocked,
+    UsbApiEventTypeEnable,
+    UsbApiEventTypeDisable,
+    UsbApiEventTypeReinit,
+    UsbApiEventTypeSetStateCallback,
+} UsbApiEventType;
+
+typedef struct {
+    FuriHalUsbStateCallback callback;
+    void* context;
+} UsbApiEventDataStateCallback;
+
+typedef struct {
+    FuriHalUsbInterface* interface;
+    void* context;
+} UsbApiEventDataInterface;
+
+typedef union {
+    UsbApiEventDataStateCallback state_callback;
+    UsbApiEventDataInterface interface;
+} UsbApiEventData;
+
+typedef union {
+    bool bool_value;
+    void* void_value;
+} UsbApiEventReturnData;
+
+typedef struct {
+    FuriApiLock lock;
+    UsbApiEventType type;
+    UsbApiEventData data;
+    UsbApiEventReturnData* return_data;
+} UsbApiEventMessage;
+
 typedef struct {
     FuriThread* thread;
+    FuriMessageQueue* queue;
     bool enabled;
     bool connected;
     bool mode_lock;
-    FuriHalUsbInterface* if_cur;
-    FuriHalUsbInterface* if_next;
-    void* if_ctx;
+    bool request_pending;
+    FuriHalUsbInterface* interface;
+    void* interface_context;
     FuriHalUsbStateCallback callback;
-    void* cb_ctx;
+    void* callback_context;
 } UsbSrv;
 
 typedef enum {
-    EventModeChange = (1 << 0),
-    EventEnable = (1 << 1),
-    EventDisable = (1 << 2),
-    EventReinit = (1 << 3),
-
-    EventReset = (1 << 4),
-    EventRequest = (1 << 5),
-
-    EventModeChangeStart = (1 << 6),
+    UsbEventReset = (1 << 0),
+    UsbEventRequest = (1 << 1),
+    UsbEventMessage = (1 << 2),
 } UsbEvent;
 
-#define USB_SRV_ALL_EVENTS                                                                    \
-    (EventModeChange | EventEnable | EventDisable | EventReinit | EventReset | EventRequest | \
-     EventModeChangeStart)
+#define USB_SRV_ALL_EVENTS (UsbEventReset | UsbEventRequest | UsbEventMessage)
 
-static UsbSrv usb;
+PLACE_IN_SECTION("MB_MEM2") static UsbSrv usb = {0};
 
 static const struct usb_string_descriptor dev_lang_desc = USB_ARRAY_DESC(USB_LANGID_ENG_US);
 
@@ -74,12 +107,13 @@ void furi_hal_usb_init(void) {
     // Reset callback will be enabled after first mode change to avoid getting false reset events
 
     usb.enabled = false;
-    usb.if_cur = NULL;
+    usb.interface = NULL;
     NVIC_SetPriority(USB_LP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 5, 0));
     NVIC_SetPriority(USB_HP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 15, 0));
     NVIC_EnableIRQ(USB_LP_IRQn);
     NVIC_EnableIRQ(USB_HP_IRQn);
 
+    usb.queue = furi_message_queue_alloc(1, sizeof(UsbApiEventMessage));
     usb.thread = furi_thread_alloc_ex("UsbDriver", 1024, furi_hal_usb_thread, NULL);
     furi_thread_mark_as_service(usb.thread);
     furi_thread_start(usb.thread);
@@ -87,53 +121,119 @@ void furi_hal_usb_init(void) {
     FURI_LOG_I(TAG, "Init OK");
 }
 
-bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
-    if(usb.mode_lock) {
-        return false;
-    }
+static void furi_hal_usb_send_message(UsbApiEventMessage* message) {
+    furi_message_queue_put(usb.queue, message, FuriWaitForever);
+    furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
+    api_lock_wait_unlock_and_free(message->lock);
+}
 
-    usb.if_next = new_if;
-    usb.if_ctx = ctx;
-    if(usb.thread == NULL) {
-        // Service thread hasn't started yet, so just save interface mode
-        return true;
-    }
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventModeChange);
-    return true;
+bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
+    UsbApiEventReturnData return_data = {
+        .bool_value = false,
+    };
+
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeSetConfig,
+        .data.interface =
+            {
+                .interface = new_if,
+                .context = ctx,
+            },
+        .return_data = &return_data,
+    };
+
+    furi_hal_usb_send_message(&msg);
+    return return_data.bool_value;
 }
 
 FuriHalUsbInterface* furi_hal_usb_get_config() {
-    return usb.if_cur;
+    UsbApiEventReturnData return_data = {
+        .void_value = NULL,
+    };
+
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeGetConfig,
+        .return_data = &return_data,
+    };
+
+    furi_hal_usb_send_message(&msg);
+    return return_data.void_value;
 }
 
 void furi_hal_usb_lock() {
-    FURI_LOG_I(TAG, "Mode lock");
-    usb.mode_lock = true;
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeLock,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }
 
 void furi_hal_usb_unlock() {
-    FURI_LOG_I(TAG, "Mode unlock");
-    usb.mode_lock = false;
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeUnlock,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }
 
 bool furi_hal_usb_is_locked() {
-    return usb.mode_lock;
+    UsbApiEventReturnData return_data = {
+        .bool_value = false,
+    };
+
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeIsLocked,
+        .return_data = &return_data,
+    };
+
+    furi_hal_usb_send_message(&msg);
+    return return_data.bool_value;
 }
 
 void furi_hal_usb_disable() {
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventDisable);
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeDisable,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }
 
 void furi_hal_usb_enable() {
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventEnable);
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeEnable,
+    };
+
+    furi_hal_usb_send_message(&msg);
 }
 
 void furi_hal_usb_reinit() {
-    furi_assert(usb.thread);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventReinit);
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeReinit,
+    };
+
+    furi_hal_usb_send_message(&msg);
+}
+
+void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) {
+    UsbApiEventMessage msg = {
+        .lock = api_lock_alloc_locked(),
+        .type = UsbApiEventTypeSetStateCallback,
+        .data.state_callback =
+            {
+                .callback = cb,
+                .context = ctx,
+            },
+    };
+
+    furi_hal_usb_send_message(&msg);
 }
 
 /* Get device / configuration descriptors */
@@ -142,29 +242,29 @@ static usbd_respond usb_descriptor_get(usbd_ctlreq* req, void** address, uint16_
     const uint8_t dnumber = req->wValue & 0xFF;
     const void* desc;
     uint16_t len = 0;
-    if(usb.if_cur == NULL) return usbd_fail;
+    if(usb.interface == NULL) return usbd_fail;
 
     switch(dtype) {
     case USB_DTYPE_DEVICE:
-        furi_thread_flags_set(furi_thread_get_id(usb.thread), EventRequest);
+        furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventRequest);
         if(usb.callback != NULL) {
-            usb.callback(FuriHalUsbStateEventDescriptorRequest, usb.cb_ctx);
+            usb.callback(FuriHalUsbStateEventDescriptorRequest, usb.callback_context);
         }
-        desc = usb.if_cur->dev_descr;
+        desc = usb.interface->dev_descr;
         break;
     case USB_DTYPE_CONFIGURATION:
-        desc = usb.if_cur->cfg_descr;
-        len = ((struct usb_string_descriptor*)(usb.if_cur->cfg_descr))->wString[0];
+        desc = usb.interface->cfg_descr;
+        len = ((struct usb_string_descriptor*)(usb.interface->cfg_descr))->wString[0];
         break;
     case USB_DTYPE_STRING:
         if(dnumber == UsbDevLang) {
             desc = &dev_lang_desc;
-        } else if((dnumber == UsbDevManuf) && (usb.if_cur->str_manuf_descr != NULL)) {
-            desc = usb.if_cur->str_manuf_descr;
-        } else if((dnumber == UsbDevProduct) && (usb.if_cur->str_prod_descr != NULL)) {
-            desc = usb.if_cur->str_prod_descr;
-        } else if((dnumber == UsbDevSerial) && (usb.if_cur->str_serial_descr != NULL)) {
-            desc = usb.if_cur->str_serial_descr;
+        } else if((dnumber == UsbDevManuf) && (usb.interface->str_manuf_descr != NULL)) {
+            desc = usb.interface->str_manuf_descr;
+        } else if((dnumber == UsbDevProduct) && (usb.interface->str_prod_descr != NULL)) {
+            desc = usb.interface->str_prod_descr;
+        } else if((dnumber == UsbDevSerial) && (usb.interface->str_serial_descr != NULL)) {
+            desc = usb.interface->str_serial_descr;
         } else
             return usbd_fail;
         break;
@@ -181,18 +281,13 @@ static usbd_respond usb_descriptor_get(usbd_ctlreq* req, void** address, uint16_
     return usbd_ack;
 }
 
-void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) {
-    usb.callback = cb;
-    usb.cb_ctx = ctx;
-}
-
 static void reset_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
     UNUSED(dev);
     UNUSED(event);
     UNUSED(ep);
-    furi_thread_flags_set(furi_thread_get_id(usb.thread), EventReset);
+    furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventReset);
     if(usb.callback != NULL) {
-        usb.callback(FuriHalUsbStateEventReset, usb.cb_ctx);
+        usb.callback(FuriHalUsbStateEventReset, usb.callback_context);
     }
 }
 
@@ -200,14 +295,14 @@ static void susp_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
     UNUSED(dev);
     UNUSED(event);
     UNUSED(ep);
-    if((usb.if_cur != NULL) && (usb.connected == true)) {
+    if((usb.interface != NULL) && (usb.connected == true)) {
         usb.connected = false;
-        usb.if_cur->suspend(&udev);
+        usb.interface->suspend(&udev);
 
         furi_hal_power_insomnia_exit();
     }
     if(usb.callback != NULL) {
-        usb.callback(FuriHalUsbStateEventSuspend, usb.cb_ctx);
+        usb.callback(FuriHalUsbStateEventSuspend, usb.callback_context);
     }
 }
 
@@ -215,101 +310,161 @@ static void wkup_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
     UNUSED(dev);
     UNUSED(event);
     UNUSED(ep);
-    if((usb.if_cur != NULL) && (usb.connected == false)) {
+    if((usb.interface != NULL) && (usb.connected == false)) {
         usb.connected = true;
-        usb.if_cur->wakeup(&udev);
+        usb.interface->wakeup(&udev);
 
         furi_hal_power_insomnia_enter();
     }
     if(usb.callback != NULL) {
-        usb.callback(FuriHalUsbStateEventWakeup, usb.cb_ctx);
+        usb.callback(FuriHalUsbStateEventWakeup, usb.callback_context);
     }
 }
 
+static void usb_process_mode_start(FuriHalUsbInterface* interface, void* context) {
+    if(usb.interface != NULL) {
+        usb.interface->deinit(&udev);
+    }
+
+    __disable_irq();
+    usb.interface = interface;
+    usb.interface_context = context;
+    __enable_irq();
+
+    if(interface != NULL) {
+        interface->init(&udev, interface, context);
+        usbd_reg_event(&udev, usbd_evt_reset, reset_evt);
+        FURI_LOG_I(TAG, "USB Mode change done");
+        usb.enabled = true;
+    }
+}
+
+static void usb_process_mode_change(FuriHalUsbInterface* interface, void* context) {
+    if(interface != usb.interface) {
+        if(usb.enabled) {
+            // Disable current interface
+            susp_evt(&udev, 0, 0);
+            usbd_connect(&udev, false);
+            usb.enabled = false;
+            furi_delay_ms(USB_RECONNECT_DELAY);
+        }
+        usb_process_mode_start(interface, context);
+    }
+}
+
+static void usb_process_mode_reinit() {
+    // Temporary disable callback to avoid getting false reset events
+    usbd_reg_event(&udev, usbd_evt_reset, NULL);
+    FURI_LOG_I(TAG, "USB Reinit");
+    susp_evt(&udev, 0, 0);
+    usbd_connect(&udev, false);
+    usb.enabled = false;
+
+    usbd_enable(&udev, false);
+    usbd_enable(&udev, true);
+
+    furi_delay_ms(USB_RECONNECT_DELAY);
+    usb_process_mode_start(usb.interface, usb.interface_context);
+}
+
+static bool usb_process_set_config(FuriHalUsbInterface* interface, void* context) {
+    if(usb.mode_lock) {
+        return false;
+    } else {
+        usb_process_mode_change(interface, context);
+        return true;
+    }
+}
+
+static void usb_process_enable(bool enable) {
+    if(enable) {
+        if((!usb.enabled) && (usb.interface != NULL)) {
+            usbd_connect(&udev, true);
+            usb.enabled = true;
+            FURI_LOG_I(TAG, "USB Enable");
+        }
+    } else {
+        if(usb.enabled) {
+            susp_evt(&udev, 0, 0);
+            usbd_connect(&udev, false);
+            usb.enabled = false;
+            usb.request_pending = false;
+            FURI_LOG_I(TAG, "USB Disable");
+        }
+    }
+}
+
+static void usb_process_message(UsbApiEventMessage* message) {
+    switch(message->type) {
+    case UsbApiEventTypeSetConfig:
+        message->return_data->bool_value = usb_process_set_config(
+            message->data.interface.interface, message->data.interface.context);
+        break;
+    case UsbApiEventTypeGetConfig:
+        message->return_data->void_value = usb.interface;
+        break;
+    case UsbApiEventTypeLock:
+        FURI_LOG_I(TAG, "Mode lock");
+        usb.mode_lock = true;
+        break;
+    case UsbApiEventTypeUnlock:
+        FURI_LOG_I(TAG, "Mode unlock");
+        usb.mode_lock = false;
+        break;
+    case UsbApiEventTypeIsLocked:
+        message->return_data->bool_value = usb.mode_lock;
+        break;
+    case UsbApiEventTypeDisable:
+        usb_process_enable(false);
+        break;
+    case UsbApiEventTypeEnable:
+        usb_process_enable(true);
+        break;
+    case UsbApiEventTypeReinit:
+        usb_process_mode_reinit();
+        break;
+    case UsbApiEventTypeSetStateCallback:
+        usb.callback = message->data.state_callback.callback;
+        usb.callback_context = message->data.state_callback.context;
+        break;
+    }
+
+    api_lock_unlock(message->lock);
+}
+
 static int32_t furi_hal_usb_thread(void* context) {
     UNUSED(context);
-    bool usb_request_pending = false;
     uint8_t usb_wait_time = 0;
-    FuriHalUsbInterface* if_new = NULL;
-    FuriHalUsbInterface* if_ctx_new = NULL;
 
-    if(usb.if_next != NULL) {
-        furi_thread_flags_set(furi_thread_get_id(usb.thread), EventModeChange);
+    if(furi_message_queue_get_count(usb.queue) > 0) {
+        furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
     }
 
     while(true) {
         uint32_t flags = furi_thread_flags_wait(USB_SRV_ALL_EVENTS, FuriFlagWaitAny, 500);
+
+        {
+            UsbApiEventMessage message;
+            if(furi_message_queue_get(usb.queue, &message, 0) == FuriStatusOk) {
+                usb_process_message(&message);
+            }
+        }
+
         if((flags & FuriFlagError) == 0) {
-            if(flags & EventModeChange) {
-                if(usb.if_next != usb.if_cur) {
-                    if_new = usb.if_next;
-                    if_ctx_new = usb.if_ctx;
-                    if(usb.enabled) { // Disable current interface
-                        susp_evt(&udev, 0, 0);
-                        usbd_connect(&udev, false);
-                        usb.enabled = false;
-                        furi_delay_ms(USB_RECONNECT_DELAY);
-                    }
-                    flags |= EventModeChangeStart;
-                }
-            }
-            if(flags & EventReinit) {
-                // Temporary disable callback to avoid getting false reset events
-                usbd_reg_event(&udev, usbd_evt_reset, NULL);
-                FURI_LOG_I(TAG, "USB Reinit");
-                susp_evt(&udev, 0, 0);
-                usbd_connect(&udev, false);
-                usb.enabled = false;
-
-                usbd_enable(&udev, false);
-                usbd_enable(&udev, true);
-
-                if_new = usb.if_cur;
-                furi_delay_ms(USB_RECONNECT_DELAY);
-                flags |= EventModeChangeStart;
-            }
-            if(flags & EventModeChangeStart) { // Second stage of mode change process
-                if(usb.if_cur != NULL) {
-                    usb.if_cur->deinit(&udev);
-                }
-                if(if_new != NULL) {
-                    if_new->init(&udev, if_new, if_ctx_new);
-                    usbd_reg_event(&udev, usbd_evt_reset, reset_evt);
-                    FURI_LOG_I(TAG, "USB Mode change done");
-                    usb.enabled = true;
-                }
-                usb.if_cur = if_new;
-            }
-            if(flags & EventEnable) {
-                if((!usb.enabled) && (usb.if_cur != NULL)) {
-                    usbd_connect(&udev, true);
-                    usb.enabled = true;
-                    FURI_LOG_I(TAG, "USB Enable");
-                }
-            }
-            if(flags & EventDisable) {
+            if(flags & UsbEventReset) {
                 if(usb.enabled) {
-                    susp_evt(&udev, 0, 0);
-                    usbd_connect(&udev, false);
-                    usb.enabled = false;
-                    usb_request_pending = false;
-                    FURI_LOG_I(TAG, "USB Disable");
-                }
-            }
-            if(flags & EventReset) {
-                if(usb.enabled) {
-                    usb_request_pending = true;
+                    usb.request_pending = true;
                     usb_wait_time = 0;
                 }
             }
-            if(flags & EventRequest) {
-                usb_request_pending = false;
+            if(flags & UsbEventRequest) {
+                usb.request_pending = false;
             }
-        } else if(usb_request_pending) {
+        } else if(usb.request_pending) {
             usb_wait_time++;
             if(usb_wait_time > 4) {
-                furi_hal_usb_reinit();
-                usb_request_pending = false;
+                usb_process_mode_reinit();
+                usb.request_pending = false;
             }
         }
     }
diff --git a/furi/core/memmgr_heap.c b/furi/core/memmgr_heap.c
index ac51b4a2..01153fe5 100644
--- a/furi/core/memmgr_heap.c
+++ b/furi/core/memmgr_heap.c
@@ -340,6 +340,10 @@ void* pvPortMalloc(size_t xWantedSize) {
     void* pvReturn = NULL;
     size_t to_wipe = xWantedSize;
 
+    if(FURI_IS_IRQ_MODE()) {
+        furi_crash("memmgt in ISR");
+    }
+
 #ifdef HEAP_PRINT_DEBUG
     BlockLink_t* print_heap_block = NULL;
 #endif
@@ -486,6 +490,10 @@ void vPortFree(void* pv) {
     uint8_t* puc = (uint8_t*)pv;
     BlockLink_t* pxLink;
 
+    if(FURI_IS_IRQ_MODE()) {
+        furi_crash("memmgt in ISR");
+    }
+
     if(pv != NULL) {
         /* The memory being freed will have an BlockLink_t structure immediately
         before it. */
diff --git a/lib/toolbox/api_lock.h b/lib/toolbox/api_lock.h
new file mode 100644
index 00000000..5902a492
--- /dev/null
+++ b/lib/toolbox/api_lock.h
@@ -0,0 +1,43 @@
+#pragma once
+#include <furi/furi.h>
+
+/*
+Testing 10000 api calls
+
+No lock
+    Time diff: 445269.218750 us
+    Time per call: 44.526920 us
+
+furi_thread_flags
+    Time diff: 430279.875000 us // lol wtf? smaller than no lock?
+    Time per call: 43.027988 us // I tested it many times, it's always smaller
+
+FuriEventFlag
+    Time diff: 831523.625000 us
+    Time per call: 83.152359 us
+
+FuriSemaphore
+    Time diff: 999807.125000 us
+    Time per call: 99.980713 us
+
+FuriMutex
+    Time diff: 1071417.500000 us
+    Time per call: 107.141747 us
+*/
+
+typedef FuriEventFlag* FuriApiLock;
+
+#define API_LOCK_EVENT (1U << 0)
+
+#define api_lock_alloc_locked() furi_event_flag_alloc()
+
+#define api_lock_wait_unlock(_lock) \
+    furi_event_flag_wait(_lock, API_LOCK_EVENT, FuriFlagWaitAny, FuriWaitForever)
+
+#define api_lock_free(_lock) furi_event_flag_free(_lock)
+
+#define api_lock_unlock(_lock) furi_event_flag_set(_lock, API_LOCK_EVENT)
+
+#define api_lock_wait_unlock_and_free(_lock) \
+    api_lock_wait_unlock(_lock);             \
+    api_lock_free(_lock);