diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
index 50561dfb6..635a20d9d 100644
--- a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
+++ b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
@@ -1772,13 +1772,10 @@ protected void bindRootPersistentClassCommonValues(HibernatePersistentEntity dom
 
         bindIdentity(domainClass, root, mappings, m, sessionFactoryBeanName);
 
-        if (m == null) {
+        if (m == null || m.getVersioned()) {
             bindVersion(domainClass.getVersion(), root, mappings, sessionFactoryBeanName);
-        }
-        else {
-            if (m.getVersioned()) {
-                bindVersion(domainClass.getVersion(), root, mappings, sessionFactoryBeanName);
-            }
+        } else {
+            root.setOptimisticLockStyle(OptimisticLockStyle.NONE);
         }
 
         root.createPrimaryKey();