diff --git a/radio/src/pulses/afhds3.h b/radio/src/pulses/afhds3.h
index fab057854..5eef56a4b 100644
--- a/radio/src/pulses/afhds3.h
+++ b/radio/src/pulses/afhds3.h
@@ -94,9 +94,6 @@ struct Data
 
   void reset()
   {
-#if !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO))
-    total = 0;
-#endif
     pulsesSize = 0;
   }
 #if defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)
@@ -118,7 +115,6 @@ struct Data
       return;
     }
     pulses[pulsesSize++] = v;
-    total += v;
   }
   void sendByte(uint8_t b)
   {
@@ -149,14 +145,7 @@ struct Data
   //add remaining time of frame
   void flush()
   {
-    uint16_t diff = AFHDS3_FRAME_HALF_US - total;
-    pulses[pulsesSize - 1] += diff;
-    //ensure 2 ms break
-    if (pulses[pulsesSize - 1] < 4000)
-    {
-      pulses[pulsesSize - 1] = 4050;
-    }
-    total += diff;
+    pulses[pulsesSize - 1] = 60000;
   }
 
   const uint16_t* getData()
diff --git a/radio/src/targets/taranis/extmodule_driver.cpp b/radio/src/targets/taranis/extmodule_driver.cpp
index 4bc47698e..b856cb309 100644
--- a/radio/src/targets/taranis/extmodule_driver.cpp
+++ b/radio/src/targets/taranis/extmodule_driver.cpp
@@ -297,15 +297,21 @@ void extmoduleSendNextFrame()
 #if defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)
       extmoduleSendBuffer(extmodulePulsesData.afhds3.getData(), extmodulePulsesData.afhds3.getSize());
 #else
+      if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN)
+        return;
+
       const uint16_t* dataPtr = extmodulePulsesData.afhds3.getData();
       uint32_t dataSize = extmodulePulsesData.afhds3.getSize();
-      EXTMODULE_TIMER->CCR2 = dataPtr[dataSize -1] - 4000; // 2mS in advance
       EXTMODULE_TIMER_DMA_STREAM->CR &= ~DMA_SxCR_EN; // Disable DMA
       EXTMODULE_TIMER_DMA_STREAM->CR |= EXTMODULE_TIMER_DMA_CHANNEL | DMA_SxCR_DIR_0 | DMA_SxCR_MINC | DMA_SxCR_PSIZE_0 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PL_0 | DMA_SxCR_PL_1;
       EXTMODULE_TIMER_DMA_STREAM->PAR = CONVERT_PTR_UINT(&EXTMODULE_TIMER->ARR);
       EXTMODULE_TIMER_DMA_STREAM->M0AR = CONVERT_PTR_UINT(dataPtr);
       EXTMODULE_TIMER_DMA_STREAM->NDTR = dataSize;
       EXTMODULE_TIMER_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA
+
+      // re-init timer
+      EXTMODULE_TIMER->EGR = TIM_PSCReloadMode_Immediate;
+      EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN;
 #endif
     }
     break;