diff --git a/obj/baseflight.hex b/obj/baseflight.hex
index b5769643e..669ec2771 100644
--- a/obj/baseflight.hex
+++ b/obj/baseflight.hex
@@ -10,7 +10,7 @@
 :100080005F8900085F8900085F8900085F890008B0
 :100090005F8900085F8900085F8900085F890008A0
 :1000A0005F8900085F8900085F8900085F89000890
-:1000B000135B00082F5B00085F8900088956000861
+:1000B000155B0008315B00085F890008895600085D
 :1000C000AB52000899560008915600085F89000855
 :1000D0005F8900085F8900085F8900085F89000860
 :1000E000194B00085F8900085F890008DFF80CD011
@@ -348,7 +348,7 @@
 :1015A000FFF7DAFA0020FFF771FB0720FFF71DFCB9
 :1015B00000F066F80820FFF724FC06460120FFF73C
 :1015C00020FC05462848007808B1012000E00020F2
-:1015D00001463246284604F0AFFA08B1FFF7B0FFE3
+:1015D00001463246284604F0B0FA08B1FFF7B0FFE2
 :1015E0001020224908600820091F086000241DE01F
 :1015F0001E480838006880F010001C49083908604F
 :101600000846006880F008000860192004F0CEFC4D
@@ -1432,74 +1432,74 @@
 :1059600001009DF8001040EA012043F29031084404
 :105970004FF48C7190FBF1F0233000B208BD0000B1
 :1059800074020020D9580008975800086958000888
-:105990002DE9FC4106460027002568E0FE4800EBA3
-:1059A000C50103C9CDE90001FC4800EBC50400981E
-:1059B000B0425AD1BDF80610304602F08CFA0128E8
-:1059C00053D1BDF80610009802F090FA0120F44976
-:1059D0000870BDF8040030B1042809D008280CD0A4
-:1059E0000C2814D10EE0009802F05EFA07460EE093
-:1059F000009802F05BFA074609E0009802F058FAB6
-:105A0000074604E0009802F055FA074600BF00BFC1
-:105A1000207808B9678000E0A780207858B9012075
-:105A200020700220DF494880BDF8040008800098FB
-:105A300001F06CFF19E0A0886188884204DDA0882D
-:105A40006188401AE08006E060884FF6FF71081A0E
-:105A5000A1880844E08000202070D2494880BDF829
-:105A600004000880009801F051FF681CC5B2082DA1
-:105A700094DBBDE8FC8170B505460221480702F0C1
-:105A80002AFA01280CD1C8480088C84908804FF07C
-:105A9000804002F009FAC44908800120C04908701A
-:105AA0000221480702F022FABF480088BF4909884E
-:105AB000884206DDBC480088BC490988401A84B287
-:105AC00008E0BA4800884FF6FF71081AB6490988FD
-:105AD000084484B2B4F57A6F03DD0020B44908703D
-:105AE00016E040F2EE2084420DDD40F6CA0084420A
-:105AF00009DAAF480078082805DAA848AC490978DF
-:105B000000EBC100C480AA480078401CA849087076
-:105B100070BD10B5A748007820B14FF08040FFF766
-:105B2000AAFF03E04FF08040FFF732FF10BD10B531
-:105B3000A148FFF72DFF10BD2DE9F0478AB00546BB
-:105B40000F4690464FF0010A0120ADF8240048208E
-:105B50008DF8270003208DF8260009A9974802F048
-:105B6000B8FB4FF000090CE00121944802F00AFC58
-:105B7000064616B14FF0000A07E009F101001FFACE
-:105B800080F942F210708145EEDB00BF8948057054
-:105B9000002407E040F2DC50804901EBC401C880DA
-:105BA000601CC4B2082CF5DB002D46D00120ADF8F6
-:105BB000240028208DF8270003208DF8260009A94D
-:105BC0007E4802F086FB1C208DF8040000208DF832
-:105BD000050001208DF806008DF8070001A800F0EF
-:105BE00032FE06A801F05AFF4720ADF818004FF624
-:105BF000FF70ADF81C000020ADF81A0006A94FF0A8
-:105C0000804001F0DBFC002066494880012088804C
-:105C10000020C880088108804FF0804001F076FEA7
-:105C200001220221480701F072FF0121880701F0DB
-:105C300059FF0A20624908706CE0CF20ADF82400BB
-:105C400028208DF8270003208DF8260009A95B483D
-:105C500002F03FFB0320ADF8240009A9594802F0E7
-:105C600038FB1C208DF8040000208DF80500012071
-:105C70008DF806008DF8070001A800F0E4FD1D2056
-:105C80008DF8040001A800F0DEFD06A801F006FF73
-:105C90004720ADF818004FF6FF70ADF81C0000204B
-:105CA000ADF81A0006A94FF0804001F087FC06A964
-:105CB000414801F083FC00203A4948800120888057
-:105CC0000020C880088100240DE0334800EBC400A8
-:105CD000808834490880304951F83400314901F056
-:105CE00015FE601CC4B2082CEFDB01221E219007B8
-:105CF00001F00DFF01221E212F4801F008FF0121B4
-:105D0000880701F0EFFE01212B4801F0EBFE062091
-:105D10002B4908704FF41060ADF8240018208DF85E
-:105D2000270003208DF8260009A9244802F0D1FAA3
-:105D30004FF47070ADF8240009A9224802F0C9FAA6
-:105D4000C7B1B8F1000F04D041F28730ADF81C00A4
-:105D500003E044F61F60ADF81C0006A91A4801F0E4
-:105D60002DFC40F6C310ADF81C0006A9174801F041
-:105D700025FC0BE040F6C310ADF81C0006A9124844
-:105D800001F01CFC06A9114801F018FC7020ADF8C8
-:105D9000080001201CE000007802002058050020C7
-:105DA000E202002098050020E4020020E602002024
-:105DB000E8020020E002002000040040000801404A
-:105DC000E1020020000C0140002C014000080040CE
+:105990002DE9FC4106460027002569E0F64800EBAA
+:1059A000C50103C9CDE90001F44800EBC504009826
+:1059B000B0425BD1BDF80610304602F08CFA0128E7
+:1059C00054D1BDF80610009802F090FA15B90120E4
+:1059D000EB490870BDF8040030B1042809D008284C
+:1059E0000CD00C2814D10EE0009802F05DFA0746A6
+:1059F0000EE0009802F05AFA074609E0009802F01B
+:105A000057FA074604E0009802F054FA074600BF30
+:105A100000BF207808B9678000E0A780207858B9D7
+:105A2000012020700220D7494880BDF8040008807A
+:105A3000009801F06BFF19E0A0886188884204DDBE
+:105A4000A0886188401AE08006E060884FF6FF7108
+:105A5000081AA1880844E08000202070C9494880C5
+:105A6000BDF804000880009801F050FF681CC5B222
+:105A7000082D93DBBDE8FC8170B50546022148077F
+:105A800002F029FA01280CD1BF480088BF490880DC
+:105A90004FF0804002F008FABB4908800120B84965
+:105AA00008700221480702F021FAB7480088B74978
+:105AB0000988884206DDB4480088B4490988401A3C
+:105AC00084B208E0B14800884FF6FF71081AAE4969
+:105AD0000988084484B2B4F57A6F03DD0020AC492C
+:105AE000087016E040F2EE2084420DDD40F6CA0058
+:105AF000844209DAA6480078082805DA9F48A449B4
+:105B0000097800EBC100C480A1480078401CA0497E
+:105B1000087070BD10B59F48007820B14FF08040EC
+:105B2000FFF7AAFF03E04FF08040FFF731FF10BD01
+:105B300010B59948FFF72CFF10BD2DE9F0478AB04A
+:105B400005460F4690464FF0010A0120ADF82400AB
+:105B500048208DF8270003208DF8260009A98F48DA
+:105B600002F0B7FB4FF000090CE001218B4802F076
+:105B700009FC064616B14FF0000A07E009F10100E2
+:105B80001FFA80F942F210708145EEDB00BF8148B8
+:105B90000570002407E040F2DC50784901EBC401B5
+:105BA000C880601CC4B2082CF5DB002D46D0012053
+:105BB000ADF8240028208DF8270003208DF826005A
+:105BC00009A9764802F085FB1C208DF8040000200E
+:105BD0008DF8050001208DF806008DF8070001A85A
+:105BE00000F031FE06A801F059FF4720ADF818007B
+:105BF0004FF6FF70ADF81C000020ADF81A0006A9A2
+:105C00004FF0804001F0DAFC00205E49488001201E
+:105C100088800020C880088108804FF0804001F013
+:105C200075FE01220221480701F071FF012188075A
+:105C300001F058FF0A205A4908706CE0CF20ADF8F7
+:105C4000240028208DF8270003208DF8260009A9BC
+:105C5000524802F03EFB0320ADF8240009A9514848
+:105C600002F037FB1C208DF8040000208DF80500A1
+:105C700001208DF806008DF8070001A800F0E3FD73
+:105C80001D208DF8040001A800F0DDFD06A801F03C
+:105C900005FF4720ADF818004FF6FF70ADF81C0067
+:105CA0000020ADF81A0006A94FF0804001F086FCF4
+:105CB00006A9394801F082FC0020324948800120C1
+:105CC00088800020C880088100240DE02A4800EB6D
+:105CD000C40080882B490880274951F8340029499D
+:105CE00001F014FE601CC4B2082CEFDB01221E215F
+:105CF000900701F00CFF01221E21274801F007FF49
+:105D00000121880701F0EEFE0121234801F0EAFE9F
+:105D10000620234908704FF41060ADF824001820C5
+:105D20008DF8270003208DF8260009A91B4802F0F2
+:105D3000D0FA4FF47070ADF8240009A9194802F0A8
+:105D4000C8FAC7B1B8F1000F04D041F28730ADF8FE
+:105D50001C0003E044F61F60ADF81C0006A91248C1
+:105D600001F02CFC40F6C310ADF81C0006A90F484A
+:105D700001F024FC28E01BE07802002058050020F8
+:105D8000E202002098050020E4020020E602002044
+:105D9000E8020020E002002000040040000801406A
+:105DA000E1020020000C0140002C014000080040EE
+:105DB00040F6C310ADF81C0006A94A4801F0FEFBEE
+:105DC00006A9494801F0FAFB7020ADF8080001204F
 :105DD000ADF80A000020ADF80C004FF47A70ADF871
 :105DE0000E000220ADF81000C001ADF8140002A9A9
 :105DF0003C4801F01CFC02A93A4801F0BFFC02A992
diff --git a/src/drv_pwm.c b/src/drv_pwm.c
index d1a758753..98e7b54f5 100755
--- a/src/drv_pwm.c
+++ b/src/drv_pwm.c
@@ -105,7 +105,8 @@ static void pwmIRQHandler(TIM_TypeDef *tim)
 
         if (channel.tim == tim && (TIM_GetITStatus(tim, channel.cc) == SET)) {
             TIM_ClearITPendingBit(channel.tim, channel.cc);
-            rcActive = true;
+            if (i == 0)
+                rcActive = true;
 
             switch (channel.channel) {
                 case TIM_Channel_1: