diff --git a/hal/serial_mock.h b/hal/serial_mock.h
index 9e425e3..27bcd98 100644
--- a/hal/serial_mock.h
+++ b/hal/serial_mock.h
@@ -122,4 +122,8 @@ class Stream {
     void println(const char* message) {
         std::cout << message << std::endl;
     }
+
+    size_t availableForWrite() {
+        return 64; // Simulate a TX buffer with 64 bytes of available space
+    }
 };
\ No newline at end of file
diff --git a/include/data_handling/Telemetry.h b/include/data_handling/Telemetry.h
index 763d745..8be1f81 100644
--- a/include/data_handling/Telemetry.h
+++ b/include/data_handling/Telemetry.h
@@ -217,6 +217,7 @@ class Telemetry {
     void addSSDToPacket(SendableSensorData* ssd);
     void setPacketToZero();
     void addEndMarker();
+    bool hasRoom(std::size_t nextIndex, std::size_t bytesToAdd);
 
     // Non-owning view of the stream list
     SendableSensorData* const* streams;
diff --git a/src/data_handling/Telemetry.cpp b/src/data_handling/Telemetry.cpp
index ccbd7ef..bb91363 100644
--- a/src/data_handling/Telemetry.cpp
+++ b/src/data_handling/Telemetry.cpp
@@ -15,8 +15,11 @@ std::size_t bytesNeededForSSD(const SendableSensorData* ssd) {
     return 0U;
 }
 
-bool hasRoom(std::size_t nextIndex, std::size_t bytesToAdd) {
-    return nextIndex + bytesToAdd <= TelemetryFmt::kPacketCapacity;
+// Checks if we have room in the packet and the TX buffer to add the next stream's data
+// If we try to send data when the TX buffer is full, the program will block until there is room (HardwareSerial::write() behavior). 
+bool Telemetry::hasRoom(std::size_t nextIndex, std::size_t bytesToAdd) {  //NOLINT(readability-convert-member-functions-to-static)
+    size_t availableOnTXBuffer = rfdSerialConnection.availableForWrite(); //NOLINT(cppcoreguidelines-init-variables)
+    return nextIndex + bytesToAdd <= TelemetryFmt::kPacketCapacity && availableOnTXBuffer >= (nextIndex + bytesToAdd);
 }
 
 void Telemetry::preparePacket(std::uint32_t timestamp) {
@@ -91,7 +94,7 @@ bool Telemetry::tick(uint32_t currentTime) {
             const std::size_t payloadBytes = bytesNeededForSSD(streams[i]);  // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
             const std::size_t totalBytesIfAdded = payloadBytes + TelemetryFmt::kEndMarkerBytes;
 
-            // Only add if it fits (payload + end marker).
+            // Only add if it fits (payload + end marker) and we have room in the TX buffer to send the packet this tick if we add it.
             if (hasRoom(nextEmptyPacketIndex, totalBytesIfAdded)) {
                 addSSDToPacket(streams[i]); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
                 streams[i]->markWasSent(currentTime); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)