diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
index 9d169ed4e21..a7ce5cf91d0 100644
--- a/drivers/rc/lirc_dev.c
+++ b/drivers/rc/lirc_dev.c
@@ -944,9 +944,10 @@ void lirc_raw_event(FAR struct lirc_lowerhalf_s *lower,
                     }
                 }
 
-              leave_critical_section(flags);
               upper->gap = false;
             }
+
+          leave_critical_section(flags);
         }
 
       sample = ev.pulse ? LIRC_PULSE(ev.duration) : LIRC_SPACE(ev.duration);