diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index c452c8d59..fe08c8716 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -160,8 +160,10 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
 
     Collection<MColumn> cols = table.getColumns().values();
     for (MColumn column : cols) {
-      writeColumnDefinition(apply, column.getName(), column.getType());
-      apply.append(",").newLine();
+      if (!column.isDraftOnly()) {
+        writeColumnDefinition(apply, column.getName(), column.getType());
+        apply.append(",").newLine();
+      }
     }
     writeColumnDefinition(apply, sysPeriodStart, sysPeriodType);
     apply.append(",").newLine();
diff --git a/src/test/java/com/avaje/tests/model/draftable/Link.java b/src/test/java/com/avaje/tests/model/draftable/Link.java
index db7c77915..c642937f1 100644
--- a/src/test/java/com/avaje/tests/model/draftable/Link.java
+++ b/src/test/java/com/avaje/tests/model/draftable/Link.java
@@ -13,7 +13,7 @@ import java.sql.Timestamp;
 import java.util.List;
 
 
-//@History
+@History
 @Draftable
 @Entity
 public class Link extends BaseDomain {