diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py
index f273f755468..8fd25354ec5 100644
--- a/lib/galaxy/model/mapping.py
+++ b/lib/galaxy/model/mapping.py
@@ -1225,9 +1225,9 @@ model.FormDefinition.table = Table(
     Column("name", TrimmedString(255), nullable=False),
     Column("desc", TEXT),
     Column("form_definition_current_id", Integer, ForeignKey("form_definition_current.id", use_alter=True), index=True, nullable=False),
-    Column("fields", JSONType),
+    Column("fields", SimpleJSONType),
     Column("type", TrimmedString(255), index=True),
-    Column("layout", JSONType))
+    Column("layout", SimpleJSONType))
 
 model.FormValues.table = Table(
     "form_values", metadata,