diff --git a/radio/src/dmafifo.h b/radio/src/dmafifo.h
index db0d885d5..837dfd2da 100644
--- a/radio/src/dmafifo.h
+++ b/radio/src/dmafifo.h
@@ -36,7 +36,7 @@ class DMAFifo
 
     void clear()
     {
-      ridx = 0;
+      ridx = N - stream->NDTR;
     }
 
     uint32_t size()
diff --git a/radio/src/io/multi_firmware_update.cpp b/radio/src/io/multi_firmware_update.cpp
index ba4932728..312b5f01b 100644
--- a/radio/src/io/multi_firmware_update.cpp
+++ b/radio/src/io/multi_firmware_update.cpp
@@ -122,8 +122,8 @@ class MultiInternalUpdateDriver: public MultiFirmwareUpdateDriver
     void deinit(bool inverted) override
     {
       IntmoduleSerialDriver.deinit(uart_ctx);
-      uart_ctx = nullptr;
       clear();
+      uart_ctx = nullptr;
     }
 };
 #endif