diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java
index a0c215f..2cb35c6 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java
@@ -6,6 +6,7 @@ import org.quartz.spi.JobFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -36,6 +37,7 @@ public class SchedulerConfig {
     return jobFactory;
   }
 
+  @ConditionalOnResource(resources = {"quartz.properties"})
   @Bean
   public Properties quartzProperties() throws IOException {
     PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
@@ -45,12 +47,13 @@ public class SchedulerConfig {
   }
 
   @Bean(name = "scheduler")
-  public SchedulerFactoryBean schedulerFactoryBean(JobFactory jobFactory) throws IOException {
+  public SchedulerFactoryBean schedulerFactoryBean(JobFactory jobFactory, Properties quartzProperties) throws IOException {
     SchedulerFactoryBean factory = new SchedulerFactoryBean();
     factory.setJobFactory(jobFactory);
     Properties mergedProperties = new Properties();
     quartzModuleProperties.stream().forEach(prop -> mergedProperties.putAll(prop.getProperties()));
-    mergedProperties.putAll(quartzProperties());
+    if (quartzProperties != null && quartzProperties.size() > 0)
+      mergedProperties.putAll(quartzProperties);
     factory.setQuartzProperties(mergedProperties);
     factory.setAutoStartup(false);
     return factory;
diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java
index 58ca61a..e7b2d99 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java
@@ -24,7 +24,7 @@ class SchedulerConfigTest {
     SchedulerConfig schedulerConfig = new SchedulerConfig(quartzModulePropertiesList);
     GenericApplicationContext applicationContext = new GenericApplicationContext();
     applicationContext.refresh();
-    SchedulerFactoryBean schedulerFactoryBean = schedulerConfig.schedulerFactoryBean(schedulerConfig.jobFactory(applicationContext));
+    SchedulerFactoryBean schedulerFactoryBean = schedulerConfig.schedulerFactoryBean(schedulerConfig.jobFactory(applicationContext), null);
 
     schedulerFactoryBean.afterPropertiesSet();
     Scheduler scheduler = schedulerFactoryBean.getScheduler();
@@ -39,7 +39,7 @@ class SchedulerConfigTest {
     SchedulerConfig schedulerConfig = new SchedulerConfig(quartzModulePropertiesList);
     GenericApplicationContext applicationContext = new GenericApplicationContext();
     applicationContext.refresh();
-    SchedulerFactoryBean schedulerFactoryBean = schedulerConfig.schedulerFactoryBean(schedulerConfig.jobFactory(applicationContext));
+    SchedulerFactoryBean schedulerFactoryBean = schedulerConfig.schedulerFactoryBean(schedulerConfig.jobFactory(applicationContext), null);
 
     schedulerFactoryBean.afterPropertiesSet();
     Scheduler scheduler = schedulerFactoryBean.getScheduler();