diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go
index b25e949e3..0c49c1c25 100644
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -22,8 +22,11 @@ func Init() {
 	orm.RegisterModel(new(legacymodel.Jxstorefeature))
 
 	orm.RegisterModel(new(legacymodel.TempLog))
-	orm.RegisterModel(new(legacymodel.Jxorder2))
-	orm.RegisterModel(new(legacymodel.Jxordersku2))
+
+	if globals.GenerateLegacyJxOrder {
+		orm.RegisterModel(new(legacymodel.Jxorder2))
+		orm.RegisterModel(new(legacymodel.Jxordersku2))
+	}
 
 	if globals.EnableStore {
 		orm.RegisterModel(&model.Place{})