diff --git a/client/src/components/Form/Form.jsx b/client/src/components/Form/Form.jsx
index ea032347e..7898a5301 100644
--- a/client/src/components/Form/Form.jsx
+++ b/client/src/components/Form/Form.jsx
@@ -125,7 +125,7 @@ class Form extends Root {
         )}
         <div className="col-sm-10" style={{ height: '100%' }}>
           <AceEditor
-            mode="json"
+            mode={ formData.schemaType === "PROTOBUF"? "protobuf"  : "json" }
             id={name}
             theme="merbivore_soft"
             value={formData[name]}
diff --git a/client/src/containers/Schema/SchemaDetail/SchemaUpdate/SchemaUpdate.jsx b/client/src/containers/Schema/SchemaDetail/SchemaUpdate/SchemaUpdate.jsx
index 90c481ff9..c225f2122 100644
--- a/client/src/containers/Schema/SchemaDetail/SchemaUpdate/SchemaUpdate.jsx
+++ b/client/src/containers/Schema/SchemaDetail/SchemaUpdate/SchemaUpdate.jsx
@@ -42,7 +42,8 @@ class SchemaUpdate extends Form {
     formData: {
       subject: '',
       compatibility: '',
-      schema: ''
+      schema: '',
+      schemaType: ''
     },
     errors: {},
     roles: JSON.parse(sessionStorage.getItem('roles'))
@@ -57,7 +58,11 @@ class SchemaUpdate extends Form {
         .label('Compatibility Level'),
     schema: Joi.string()
         .required()
-        .label('Latest Schema')
+        .label('Latest Schema'),
+    schemaType: Joi.string()
+        .label('Schema Type'),
+    references: Joi.any()
+        .label('Refecences')
   };
 
   componentDidMount() {
@@ -81,7 +86,9 @@ class SchemaUpdate extends Form {
 
     formData.subject = latestSchemaVersion.subject;
     formData.compatibility = latestSchemaVersion.compatibilityLevel;
-    formData.schema = JSON.stringify(JSON.parse(latestSchemaVersion.schema), null, 2);
+    formData.schemaType = latestSchemaVersion.schemaType;
+    formData.schema = "PROTOBUF" === formData.schemaType?latestSchemaVersion.schema :JSON.stringify(JSON.parse(latestSchemaVersion.schema), null, 2);
+    formData.references = latestSchemaVersion.references;
 
     this.setState(formData);
   };
@@ -92,7 +99,9 @@ class SchemaUpdate extends Form {
       clusterId,
       subject: formData.subject,
       compatibilityLevel: formData.compatibility,
-      schema: formData.schema
+      schema: formData.schema,
+      schemaType: formData.schemaType,
+      references: formData.references
     };
 
     this.postApi(uriUpdateSchema(clusterId, formData.subject), body)
diff --git a/src/main/java/org/akhq/controllers/SchemaController.java b/src/main/java/org/akhq/controllers/SchemaController.java
index d55b78386..100fba7ba 100644
--- a/src/main/java/org/akhq/controllers/SchemaController.java
+++ b/src/main/java/org/akhq/controllers/SchemaController.java
@@ -106,7 +106,7 @@ public Schema updateSchema(String cluster, String subject, @Body Schema schema)
     }
 
     private Schema registerSchema(String cluster, @Body Schema schema) throws IOException, RestClientException {
-        Schema register = this.schemaRepository.register(cluster, schema.getSubject(), schema.getSchema(), schema.getReferences());
+        Schema register = this.schemaRepository.register(cluster, schema.getSubject(), schema.getSchemaType(), schema.getSchema(), schema.getReferences());
 
         if (schema.getCompatibilityLevel() != null) {
             this.schemaRepository.updateConfig(
diff --git a/src/main/java/org/akhq/repositories/SchemaRegistryRepository.java b/src/main/java/org/akhq/repositories/SchemaRegistryRepository.java
index 0247392e1..a78785fc0 100644
--- a/src/main/java/org/akhq/repositories/SchemaRegistryRepository.java
+++ b/src/main/java/org/akhq/repositories/SchemaRegistryRepository.java
@@ -182,9 +182,13 @@ public List<String> testCompatibility(String clusterId, String subject, org.apac
     }
 
     public Schema register(String clusterId, String subject, String schema, List<SchemaReference> references) throws IOException, RestClientException {
+        return register(clusterId, subject, null, schema, references);
+    }
+
+    public Schema register(String clusterId, String subject, String type, String schema, List<SchemaReference> references) throws IOException, RestClientException {
         int id = this.kafkaModule
             .getRegistryRestClient(clusterId)
-            .registerSchema(schema, "AVRO", references, subject);
+            .registerSchema(schema, type != null? type: "AVRO", references, subject);
 
         Schema latestVersion = getLatestVersion(clusterId, subject);
 
@@ -293,7 +297,7 @@ public Deserializer getKafkaProtoDeserializer(String clusterId) {
             Deserializer deserializer;
             SchemaRegistryType schemaRegistryType = getSchemaRegistryType(clusterId);
             if (schemaRegistryType == SchemaRegistryType.TIBCO) {
-                throw new IllegalArgumentException("Configured schema registry type was 'tibco', but TIBCO JSON client is not supported");
+                throw new IllegalArgumentException("Configured schema registry type was 'tibco', but TIBCO PROTOBUF client is not supported");
             } else {
                 deserializer = new KafkaProtobufDeserializer(this.kafkaModule.getRegistryClient(clusterId));
             }