diff --git a/src/fw/hotspot b/src/fw/hotspot
index f0fd3283..13e51c67 160000
--- a/src/fw/hotspot
+++ b/src/fw/hotspot
@@ -1 +1 @@
-Subproject commit f0fd328381f4a6509570481a8f71afc9828aef90
+Subproject commit 13e51c67719f4983be7504967baf591f21375cb7
diff --git a/src/fw/modem b/src/fw/modem
index c81ba8e0..7010670d 160000
--- a/src/fw/modem
+++ b/src/fw/modem
@@ -1 +1 @@
-Subproject commit c81ba8e0cec74115d1e06b83a4af9edf475875e5
+Subproject commit 7010670d960d480f0d227b54db0a0d595ff436a7
diff --git a/src/host/modem/Modem.cpp b/src/host/modem/Modem.cpp
index 03fba0e7..2575e558 100644
--- a/src/host/modem/Modem.cpp
+++ b/src/host/modem/Modem.cpp
@@ -364,6 +364,13 @@ void Modem::setFifoLength(uint16_t dmrLength, uint16_t p25Length, uint16_t nxdnL
     if (m_nxdnFifoLength < NXDN_TX_BUFFER_LEN)
         m_nxdnFifoLength = NXDN_TX_BUFFER_LEN;
 
+    if (!m_dmrEnabled && m_dmrFifoLength > 0U)
+        m_dmrFifoLength = 0U;
+    if (!m_p25Enabled && m_p25FifoLength > 0U)
+        m_p25FifoLength = 0U;
+    if (!m_nxdnEnabled && m_nxdnFifoLength > 0U)
+        m_nxdnFifoLength = 0U;
+
     uint8_t buffer[9U];
 
     buffer[0U] = DVM_SHORT_FRAME_START;