diff --git a/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java b/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
index fe964ed15d2..98c37297663 100644
--- a/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
+++ b/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
@@ -53,13 +53,17 @@ public class GrailsAnnotationConfiguration extends AnnotationConfiguration imple
      * @see org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainConfiguration#addDomainClass(org.codehaus.groovy.grails.commons.GrailsDomainClass)
      */
     public GrailsDomainConfiguration addDomainClass(GrailsDomainClass domainClass) {
-        if (!AnnotationDomainClassArtefactHandler.isJPADomainClass(domainClass.getClazz())) {
+        if (shouldMapWithGorm(domainClass)) {
             domainClasses.add(domainClass);
         }
 
         return this;
     }
 
+    private boolean shouldMapWithGorm(GrailsDomainClass domainClass) {
+        return !AnnotationDomainClassArtefactHandler.isJPADomainClass(domainClass.getClazz()) && domainClass.getMappingStrategy().equalsIgnoreCase(GrailsDomainClass.GORM);
+    }
+
     /* (non-Javadoc)
      * @see org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainConfiguration#setGrailsApplication(org.codehaus.groovy.grails.commons.GrailsApplication)
      */