diff --git a/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c b/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
index c4323a56d..121f08565 100644
--- a/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
+++ b/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
@@ -60,7 +60,7 @@ static int32_t avr_isp_worker_rw_thread(void* context) {
     AvrIspWorkerRW* instance = context;
 
     /* start PWM on &gpio_ext_pa4 */
-    if(!furi_hal_bus_is_enabled(FuriHalBusLPTIM2)) {
+    if(!furi_hal_pwm_is_running(FuriHalPwmOutputIdLptim2PA4)) {
         furi_hal_pwm_start(FuriHalPwmOutputIdLptim2PA4, 4000000, 50);
     }
 
@@ -124,7 +124,7 @@ static int32_t avr_isp_worker_rw_thread(void* context) {
     }
     FURI_LOG_D(TAG, "Stop");
 
-    if(furi_hal_bus_is_enabled(FuriHalBusLPTIM2)) {
+    if(furi_hal_pwm_is_running(FuriHalPwmOutputIdLptim2PA4)) {
         furi_hal_pwm_stop(FuriHalPwmOutputIdLptim2PA4);
     }
 
@@ -141,7 +141,7 @@ bool avr_isp_worker_rw_detect_chip(AvrIspWorkerRW* instance) {
 
     /* start PWM on &gpio_ext_pa4 */
     bool was_pwm_enabled = false;
-    if(!furi_hal_bus_is_enabled(FuriHalBusLPTIM2)) {
+    if(!furi_hal_pwm_is_running(FuriHalPwmOutputIdLptim2PA4)) {
         furi_hal_pwm_start(FuriHalPwmOutputIdLptim2PA4, 4000000, 50);
     } else {
         was_pwm_enabled = true;
@@ -209,7 +209,7 @@ bool avr_isp_worker_rw_detect_chip(AvrIspWorkerRW* instance) {
 
     } while(0);
 
-    if(furi_hal_bus_is_enabled(FuriHalBusLPTIM2) && !was_pwm_enabled) {
+    if(furi_hal_pwm_is_running(FuriHalPwmOutputIdLptim2PA4) && !was_pwm_enabled) {
         furi_hal_pwm_stop(FuriHalPwmOutputIdLptim2PA4);
     }
 
diff --git a/applications/external/signal_generator/scenes/signal_gen_scene_pwm.c b/applications/external/signal_generator/scenes/signal_gen_scene_pwm.c
index 9e09a472d..1cadb3a1a 100644
--- a/applications/external/signal_generator/scenes/signal_gen_scene_pwm.c
+++ b/applications/external/signal_generator/scenes/signal_gen_scene_pwm.c
@@ -34,7 +34,7 @@ void signal_gen_scene_pwm_on_enter(void* context) {
 
     signal_gen_pwm_set_params(app->pwm_view, 0, DEFAULT_FREQ, DEFAULT_DUTY);
 
-    if(!furi_hal_bus_is_enabled(FuriHalBusTIM1)) {
+    if(!furi_hal_pwm_is_running(pwm_ch_id[0])) {
         furi_hal_pwm_start(pwm_ch_id[0], DEFAULT_FREQ, DEFAULT_DUTY);
     } else {
         furi_hal_pwm_stop(pwm_ch_id[0]);
@@ -53,30 +53,16 @@ bool signal_gen_scene_pwm_on_event(void* context, SceneManagerEvent event) {
         } else if(event.event == SignalGenPwmEventChannelChange) {
             consumed = true;
             // Stop previous channel PWM
-            if(app->pwm_ch_prev == FuriHalPwmOutputIdTim1PA7) {
-                if(furi_hal_bus_is_enabled(FuriHalBusTIM1)) {
-                    furi_hal_pwm_stop(app->pwm_ch_prev);
-                }
-            } else if(app->pwm_ch_prev == FuriHalPwmOutputIdLptim2PA4) {
-                if(furi_hal_bus_is_enabled(FuriHalBusLPTIM2)) {
-                    furi_hal_pwm_stop(app->pwm_ch_prev);
-                }
+            if(furi_hal_pwm_is_running(app->pwm_ch_prev)) {
+                furi_hal_pwm_stop(app->pwm_ch_prev);
             }
+
             // Start PWM and restart if it was starter already
-            if(app->pwm_ch == FuriHalPwmOutputIdTim1PA7) {
-                if(furi_hal_bus_is_enabled(FuriHalBusTIM1)) {
-                    furi_hal_pwm_stop(app->pwm_ch);
-                    furi_hal_pwm_start(app->pwm_ch, app->pwm_freq, app->pwm_duty);
-                } else {
-                    furi_hal_pwm_start(app->pwm_ch, app->pwm_freq, app->pwm_duty);
-                }
-            } else if(app->pwm_ch == FuriHalPwmOutputIdLptim2PA4) {
-                if(furi_hal_bus_is_enabled(FuriHalBusLPTIM2)) {
-                    furi_hal_pwm_stop(app->pwm_ch);
-                    furi_hal_pwm_start(app->pwm_ch, app->pwm_freq, app->pwm_duty);
-                } else {
-                    furi_hal_pwm_start(app->pwm_ch, app->pwm_freq, app->pwm_duty);
-                }
+            if(furi_hal_pwm_is_running(app->pwm_ch)) {
+                furi_hal_pwm_stop(app->pwm_ch);
+                furi_hal_pwm_start(app->pwm_ch, app->pwm_freq, app->pwm_duty);
+            } else {
+                furi_hal_pwm_start(app->pwm_ch, app->pwm_freq, app->pwm_duty);
             }
         }
     }
@@ -87,13 +73,7 @@ void signal_gen_scene_pwm_on_exit(void* context) {
     SignalGenApp* app = context;
     variable_item_list_reset(app->var_item_list);
 
-    if(app->pwm_ch == FuriHalPwmOutputIdTim1PA7) {
-        if(furi_hal_bus_is_enabled(FuriHalBusTIM1)) {
-            furi_hal_pwm_stop(app->pwm_ch);
-        }
-    } else if(app->pwm_ch == FuriHalPwmOutputIdLptim2PA4) {
-        if(furi_hal_bus_is_enabled(FuriHalBusLPTIM2)) {
-            furi_hal_pwm_stop(app->pwm_ch);
-        }
+    if(furi_hal_pwm_is_running(app->pwm_ch)) {
+        furi_hal_pwm_stop(app->pwm_ch);
     }
 }
diff --git a/applications/external/signal_generator/signal_gen_app_i.h b/applications/external/signal_generator/signal_gen_app_i.h
index 2d31dda60..60e4d7ed9 100644
--- a/applications/external/signal_generator/signal_gen_app_i.h
+++ b/applications/external/signal_generator/signal_gen_app_i.h
@@ -4,7 +4,6 @@
 
 #include <furi_hal_clock.h>
 #include <furi_hal_pwm.h>
-#include <furi_hal_bus.h>
 
 #include <gui/gui.h>
 #include <gui/view_dispatcher.h>
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 26e4c0b3e..41d38cb90 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,30.1,,
+Version,+,30.2,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1306,6 +1306,7 @@ Function,+,furi_hal_power_sleep,void,
 Function,+,furi_hal_power_sleep_available,_Bool,
 Function,+,furi_hal_power_suppress_charge_enter,void,
 Function,+,furi_hal_power_suppress_charge_exit,void,
+Function,+,furi_hal_pwm_is_running,_Bool,FuriHalPwmOutputId
 Function,+,furi_hal_pwm_set_params,void,"FuriHalPwmOutputId, uint32_t, uint8_t"
 Function,+,furi_hal_pwm_start,void,"FuriHalPwmOutputId, uint32_t, uint8_t"
 Function,+,furi_hal_pwm_stop,void,FuriHalPwmOutputId
diff --git a/firmware/targets/f7/furi_hal/furi_hal_pwm.c b/firmware/targets/f7/furi_hal/furi_hal_pwm.c
index 7e985cbb1..879460e6b 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_pwm.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_pwm.c
@@ -82,6 +82,15 @@ void furi_hal_pwm_stop(FuriHalPwmOutputId channel) {
     }
 }
 
+bool furi_hal_pwm_is_running(FuriHalPwmOutputId channel) {
+    if(channel == FuriHalPwmOutputIdTim1PA7) {
+        return furi_hal_bus_is_enabled(FuriHalBusTIM1);
+    } else if(channel == FuriHalPwmOutputIdLptim2PA4) {
+        return furi_hal_bus_is_enabled(FuriHalBusLPTIM2);
+    }
+    return false;
+}
+
 void furi_hal_pwm_set_params(FuriHalPwmOutputId channel, uint32_t freq, uint8_t duty) {
     furi_assert(freq > 0);
     uint32_t freq_div = 64000000LU / freq;
diff --git a/firmware/targets/f7/furi_hal/furi_hal_pwm.h b/firmware/targets/f7/furi_hal/furi_hal_pwm.h
index a8682c5fb..16acca05e 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_pwm.h
+++ b/firmware/targets/f7/furi_hal/furi_hal_pwm.h
@@ -9,6 +9,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include <stdbool.h>
 
 typedef enum {
     FuriHalPwmOutputIdTim1PA7,
@@ -37,6 +38,13 @@ void furi_hal_pwm_stop(FuriHalPwmOutputId channel);
 */
 void furi_hal_pwm_set_params(FuriHalPwmOutputId channel, uint32_t freq, uint8_t duty);
 
+/** Is PWM channel running?
+ * 
+ * @param[in]  channel  PWM channel (FuriHalPwmOutputId)
+ * @return bool - true if running
+*/
+bool furi_hal_pwm_is_running(FuriHalPwmOutputId channel);
+
 #ifdef __cplusplus
 }
 #endif