diff --git a/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt b/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt
index d778db6519..aed54fd0d3 100644
--- a/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt
+++ b/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt
@@ -29,11 +29,10 @@ class SnodeVersionTest(
             // Snode.Version only considers the first 4 integers, so these are equal
             arrayOf("1.0.0.0", "1.0.0.0.1", true, false),
             arrayOf("1.0.0.1", "1.0.0.1", true, false),
-            arrayOf("12345.12345.12345.12345", "12345.12345.12345.12345", true, false),
-            arrayOf("11111.11111.11111.11111", "11111.11111.11111.99999", false, true),
-            arrayOf("11111.11111.11111.11111", "11111.11111.99999.99999", false, true),
-            arrayOf("11111.11111.11111.11111", "11111.99999.99999.99999", false, true),
-            arrayOf("11111.11111.11111.11111", "99999.99999.99999.99999", false, true),
+            // parts can be up to 16 bits, around 65,535
+            arrayOf("65535.65535.65535.65535", "65535.65535.65535.65535", true, false),
+            // values higher than this are coerced to 65535 (:
+            arrayOf("65535.65535.65535.65535", "65535.65535.65535.99999", true, false),
         )
     }
 
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
index f918dbbf73..86f3e26b64 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
@@ -64,7 +64,7 @@ class Snode(val address: String, val port: Int, val publicKeySet: KeySet?, val v
             private const val MASK = 0xFFFFUL
 
             private fun Sequence<ULong>.foldToVersionAsULong() = take(4).foldIndexed(0UL) { i, acc, it ->
-                it and MASK shl (3 - i) * MASK_BITS or acc
+                it.coerceAtMost(MASK) shl (3 - i) * MASK_BITS or acc
             }
         }