diff --git a/core-test/src/test/scala/org/bitcoins/core/serializers/p2p/messages/RawAddrV2MessageSerializerTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/p2p/messages/RawAddrV2MessageSerializerTest.scala
index 9e4a75d464..8fe260be77 100644
--- a/core-test/src/test/scala/org/bitcoins/core/serializers/p2p/messages/RawAddrV2MessageSerializerTest.scala
+++ b/core-test/src/test/scala/org/bitcoins/core/serializers/p2p/messages/RawAddrV2MessageSerializerTest.scala
@@ -6,7 +6,7 @@ import org.bitcoins.core.protocol.CompactSizeUInt
 import org.bitcoins.testkit.core.gen.NumberGenerator
 import org.bitcoins.testkit.util.BitcoinSUnitTest
 import org.scalacheck.Gen
-import scodec.bits.HexStringSyntax
+import scodec.bits.{ByteVector, HexStringSyntax}
 
 import java.net.InetAddress
 
@@ -67,9 +67,13 @@ class RawAddrV2MessageSerializerTest extends BitcoinSUnitTest {
     for {
       time <- NumberGenerator.uInt32s
       services <- NumberGenerator.compactSizeUInts
-      addrBytes <- NumberGenerator.bytevector(AddrV2Message.CJDNS_ADDR_LENGTH)
+      addrBytes <-
+        NumberGenerator.bytevector(AddrV2Message.CJDNS_ADDR_LENGTH - 1)
       port <- NumberGenerator.uInt16
-    } yield CJDNSAddrV2Message(time, services, addrBytes, port)
+    } yield CJDNSAddrV2Message(time,
+                               services,
+                               ByteVector.fromByte(0xfc.toByte) ++ addrBytes,
+                               port)
   }
 
   def unknownAddrV2MessageGen: Gen[UnknownNetworkAddrV2Message] = {
@@ -177,11 +181,11 @@ class RawAddrV2MessageSerializerTest extends BitcoinSUnitTest {
   it must "parse a CJDNSAddrV2Message" in {
     val msg = CJDNSAddrV2Message(UInt32(4523),
                                  CompactSizeUInt(UInt64(53453453L)),
-                                 hex"00000000000000000000000000000000",
+                                 hex"fc000000000000000000000000000000",
                                  UInt16(8333))
 
     assert(
-      "000011abfe8da22f030600000000000000000000000000000000208d" == msg.hex)
+      "000011abfe8da22f0306fc000000000000000000000000000000208d" == msg.hex)
   }
 
   "UnknownNetworkAddrV2Message" must "have serialization symmetry" in {
diff --git a/core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala b/core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala
index 318a2bb596..e17bd1c026 100644
--- a/core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala
+++ b/core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala
@@ -622,6 +622,8 @@ case class CJDNSAddrV2Message(
     addrBytes: ByteVector,
     port: UInt16)
     extends AddrV2Message {
+  require(addrBytes.head == 0xfc.toByte,
+          s"CJDNS addresses start with 0xFC, got $addrBytes")
   require(
     addrBytes.size == AddrV2Message.CJDNS_ADDR_LENGTH,
     s"CJDNS addresses are ${AddrV2Message.CJDNS_ADDR_LENGTH} bytes, got ${addrBytes.size}")