diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
index 049766a1e..750eccd9c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
@@ -222,7 +222,7 @@ public class DefaultContainer implements SpiContainer {
     List<Class<?>> entityClasses = serverConfig.getClasses();
     if (serverConfig.isDisableClasspathSearch() || (entityClasses != null && entityClasses.size() > 0)) {
       // use classes we explicitly added via configuration
-      return new BootupClasses(serverConfig.getClasses());
+      return new BootupClasses(entityClasses);
     }
 
     return BootupClassPathSearch.search(serverConfig);