diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
index e7f914ca1..c5d5a9462 100644
--- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
@@ -2346,6 +2346,10 @@ void *start_timer(void *arg) {
                    imageData + srcOffset, dataSize);
             srcOffset += dataSize;
 
+            dataSize = (srcOffset + dataSize > imageSize)
+                           ? (imageSize - srcOffset)
+                           : dataSize;
+
             sendUDPPacket(0, 0, packetData, packetSize);
             // LOG(logINFOBLUE, ("packetsize:%d\n", packetSize));
         }
diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
index 3fe36be67..7eb731c98 100644
--- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
@@ -1589,6 +1589,10 @@ void *start_timer(void *arg) {
             srcOffset += dataSize;
             dataSent += dataSize;
 
+            dataSize = (srcOffset + dataSize > imageSize)
+                           ? (imageSize - srcOffset)
+                           : dataSize;
+
             sendUDPPacket(0, 0, packetData, packetSize);
         }
         LOG(logINFO, ("Sent frame: %d [%lld]\n", iframes, frameNr + iframes));