diff --git a/components/mqtt/Kconfig b/components/mqtt/Kconfig
index de79975aa..e0d5f318b 100644
--- a/components/mqtt/Kconfig
+++ b/components/mqtt/Kconfig
@@ -78,6 +78,21 @@ menu "ESP-MQTT Configurations"
         help
             MQTT task stack size
 
+    config MQTT_DISABLE_API_LOCKS
+        bool "Disable API locks"
+        default n
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            Default config employs API locks to protect internal structures. It is possible to disable
+            these locks if the user code doesn't access MQTT API from multiple concurrent tasks
+
+    config MQTT_TASK_PRIORITY
+        int "MQTT task priority"
+        default 5
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            MQTT task priority. Higher number denotes higher priority.
+
     config MQTT_TASK_CORE_SELECTION_ENABLED
         bool "Enable MQTT task core selection"
         default false
diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt
index 86fc8b758..6bc94add8 160000
--- a/components/mqtt/esp-mqtt
+++ b/components/mqtt/esp-mqtt
@@ -1 +1 @@
-Subproject commit 86fc8b7584f7f3aebf422843d84a26655e485fbe
+Subproject commit 6bc94add892437d0fd50f26bfabe78c646648c13