diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerClient.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerClient.java
index 4c21e30b..624d448a 100644
--- a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerClient.java
+++ b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerClient.java
@@ -219,11 +219,15 @@ public SchedulerClient build() {
       TaskResolver taskResolver = new TaskResolver(StatsRegistry.NOOP, knownTasks);
       final SystemClock clock = new SystemClock();
 
+      final JdbcCustomization jdbcCustomization =
+          ofNullable(this.jdbcCustomization)
+              .orElseGet(() -> new AutodetectJdbcCustomization(dataSource));
+
       TaskRepository taskRepository =
           new JdbcTaskRepository(
               dataSource,
               false,
-              ofNullable(jdbcCustomization).orElse(new AutodetectJdbcCustomization(dataSource)),
+              jdbcCustomization,
               tableName,
               taskResolver,
               new SchedulerClientName(),