diff --git a/lib/signal_reader/signal_reader.c b/lib/signal_reader/signal_reader.c
index 1c08d29f45..c06c7a5c0e 100644
--- a/lib/signal_reader/signal_reader.c
+++ b/lib/signal_reader/signal_reader.c
@@ -228,6 +228,7 @@ void signal_reader_start(SignalReader* instance, SignalReaderCallback callback,
     /* We need the EXTI to be configured as interrupt generating line, but no ISR registered */
     furi_hal_gpio_init(
         instance->pin, GpioModeInterruptRiseFall, instance->pull, GpioSpeedVeryHigh);
+    furi_hal_gpio_enable_int_callback(instance->pin);
 
     /* Set DMAMUX request generation signal ID on specified DMAMUX channel */
     LL_DMAMUX_SetRequestSignalID(
@@ -309,6 +310,8 @@ void signal_reader_stop(SignalReader* instance) {
 
     furi_hal_interrupt_set_isr(SIGNAL_READER_DMA_GPIO_IRQ, NULL, NULL);
 
+    furi_hal_gpio_disable_int_callback(instance->pin);
+
     // Deinit DMA Rx pin
     LL_DMA_DeInit(SIGNAL_READER_DMA_GPIO_DEF);
     // Deinit DMA Sync timer
diff --git a/targets/f7/furi_hal/furi_hal_gpio.c b/targets/f7/furi_hal/furi_hal_gpio.c
index 1e703b5d16..da195bdca0 100644
--- a/targets/f7/furi_hal/furi_hal_gpio.c
+++ b/targets/f7/furi_hal/furi_hal_gpio.c
@@ -215,11 +215,8 @@ void furi_hal_gpio_enable_int_callback(const GpioPin* gpio) {
 
     FURI_CRITICAL_ENTER();
 
-    uint8_t pin_num = furi_hal_gpio_get_pin_num(gpio);
-    if(gpio_interrupt[pin_num].callback) {
-        const uint32_t exti_line = GET_EXTI_LINE(gpio->pin);
-        LL_EXTI_EnableIT_0_31(exti_line);
-    }
+    const uint32_t exti_line = GET_EXTI_LINE(gpio->pin);
+    LL_EXTI_EnableIT_0_31(exti_line);
 
     FURI_CRITICAL_EXIT();
 }