diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 353f76a28d..e26a894959 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -288,6 +288,8 @@ void closeSerialPort(serialPort_t *serialPort) {
         return;
     }
 
+    // TODO wait until data has been transmitted.
+
     serialPort->callback = NULL;
 
     serialPortUsage->function = FUNCTION_NONE;
diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c
index 49223e4b88..c02eaf756d 100644
--- a/src/main/telemetry/frsky.c
+++ b/src/main/telemetry/frsky.c
@@ -432,12 +432,6 @@ void configureFrSkyTelemetryPort(void)
     frskyTelemetryEnabled = true;
 }
 
-
-bool canSendFrSkyTelemetry(void)
-{
-    return frskyPort && serialTotalBytesWaiting(frskyPort) == 0;
-}
-
 bool hasEnoughTimeLapsedSinceLastTelemetryTransmission(uint32_t currentMillis)
 {
     return currentMillis - lastCycleTime >= CYCLETIME;
@@ -463,10 +457,6 @@ void handleFrSkyTelemetry(void)
         return;
     }
 
-    if (!canSendFrSkyTelemetry()) {
-        return;
-    }
-
     uint32_t now = millis();
 
     if (!hasEnoughTimeLapsedSinceLastTelemetryTransmission(now)) {