diff --git a/core/src/main/kotlin/net/corda/core/serialization/amqp/SerializationOutput.kt b/core/src/main/kotlin/net/corda/core/serialization/amqp/SerializationOutput.kt
index 3cbfad41ba..41575ac377 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/amqp/SerializationOutput.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/amqp/SerializationOutput.kt
@@ -34,7 +34,7 @@ open class SerializationOutput(internal val serializerFactory: SerializerFactory
                     // Our object
                     writeObject(obj, this)
                     // The schema
-                    putObject(Schema(schemaHistory.toList()))
+                    writeSchema(Schema(schemaHistory.toList()), this)
                 }
             }
             val bytes = ByteArray(data.encodedSize().toInt() + 8)
@@ -53,6 +53,10 @@ open class SerializationOutput(internal val serializerFactory: SerializerFactory
         writeObject(obj, data, obj.javaClass)
     }
 
+    open fun writeSchema(schema: Schema, data: Data) {
+        data.putObject(schema)
+    }
+
     internal fun writeObjectOrNull(obj: Any?, data: Data, type: Type) {
         if (obj == null) {
             data.putNull()