diff --git a/ebean-core/src/main/java/io/ebean/metric/MetricServiceProvider.java b/ebean-core/src/main/java/io/ebean/metric/MetricServiceProvider.java
index b7208cefd..89603ee56 100644
--- a/ebean-core/src/main/java/io/ebean/metric/MetricServiceProvider.java
+++ b/ebean-core/src/main/java/io/ebean/metric/MetricServiceProvider.java
@@ -1,7 +1,5 @@
 package io.ebean.metric;
 
-import io.ebeaninternal.server.profile.DMetricFactory;
-
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
@@ -13,12 +11,11 @@ class MetricServiceProvider {
   private static final MetricFactory metricFactory = init();
 
   private static MetricFactory init() {
-
     Iterator<MetricFactory> loader = ServiceLoader.load(MetricFactory.class).iterator();
     if (loader.hasNext()) {
       return loader.next();
     }
-    return new DMetricFactory();
+    throw new IllegalStateException("MetricFactory not service loaded?");
   }
 
   /**
diff --git a/ebean-core/src/main/resources/META-INF/services/io.ebean.metric.MetricFactory b/ebean-core/src/main/resources/META-INF/services/io.ebean.metric.MetricFactory
new file mode 100644
index 000000000..ef1bb4c59
--- /dev/null
+++ b/ebean-core/src/main/resources/META-INF/services/io.ebean.metric.MetricFactory
@@ -0,0 +1 @@
+io.ebeaninternal.server.profile.DMetricFactory