diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
index 2b6dd5c84..fedada9b6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -287,10 +287,11 @@ public final class DefaultServer implements SpiEbeanServer {
       } 
     }
     
-    if (ddlGenerator == null){
-    	ddlGenerator = new DdlGenerator();
-    	 spiPlugins.add(ddlGenerator);
-    	 ddlGenerator.setup(this, this.getDatabasePlatform(), config.getServerConfig());
+    if (ddlGenerator == null) {
+      // ServiceLoader not finding ddlGenerator (typically OSGi) 
+      ddlGenerator = new DdlGenerator();
+      spiPlugins.add(ddlGenerator);
+      ddlGenerator.setup(this, this.getDatabasePlatform(), config.getServerConfig());
     }
 
     ebeanPlugins = Collections.unmodifiableList(spiPlugins);