diff --git a/libraries/networking/src/udt/Constants.h b/libraries/networking/src/udt/Constants.h
index 8c73a230df..0152444f84 100644
--- a/libraries/networking/src/udt/Constants.h
+++ b/libraries/networking/src/udt/Constants.h
@@ -27,6 +27,7 @@ namespace udt {
     static const int DEFAULT_SYN_INTERVAL_USECS = 10 * 1000;
     static const int SEQUENCE_NUMBER_BITS = sizeof(SequenceNumber) * 8;
     static const int MESSAGE_LINE_NUMBER_BITS = 32;
+    static const int MESSAGE_NUMBER_BITS = 30;
     static const uint32_t CONTROL_BIT_MASK = uint32_t(1) << (SEQUENCE_NUMBER_BITS - 1);
 }
 
diff --git a/libraries/networking/src/udt/SendQueue.cpp b/libraries/networking/src/udt/SendQueue.cpp
index 2c2ff7350b..650542dec5 100644
--- a/libraries/networking/src/udt/SendQueue.cpp
+++ b/libraries/networking/src/udt/SendQueue.cpp
@@ -161,7 +161,7 @@ SequenceNumber SendQueue::getNextSequenceNumber() {
 }
 
 uint32_t SendQueue::getNextMessageNumber() {
-    static const MessageNumber MAX_MESSAGE_NUMBER = MessageNumber(1) << 30;
+    static const MessageNumber MAX_MESSAGE_NUMBER = MessageNumber(1) << MESSAGE_NUMBER_BITS;
     _currentMessageNumber = (_currentMessageNumber + 1) % MAX_MESSAGE_NUMBER;
     return _currentMessageNumber;
 }