diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index b04031f50b..6eb03f7520 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -1017,7 +1017,7 @@
       <property name="solrUrl" value="${solr.solrUrl}"/>
       <property name="solrUser" value="${solr.solrUser}"/>
       <property name="solrPassword" value="${solr.solrPassword}"/>
-      <property name="solrPingTime" value="${solr.pingTime}"/>
+      <property name="solrPingCronExpression" value="${solr.solrPingCronExpression}"/>
     </bean>
 
     <bean id="solr" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean">
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 30daf7346d..03482b98e8 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -679,6 +679,8 @@ solr.solrUser=solr
 solr.solrPassword=solr
 solr.secureComms.enabled=true
 
+solr.solrPingCronExpression=0 0/5 * * * ? *
+
 #
 # Web Publishing Properties
 #
diff --git a/source/java/org/alfresco/repo/solr/SOLRAdminClient.java b/source/java/org/alfresco/repo/solr/SOLRAdminClient.java
index b2bce82e6c..dabeb8e6aa 100644
--- a/source/java/org/alfresco/repo/solr/SOLRAdminClient.java
+++ b/source/java/org/alfresco/repo/solr/SOLRAdminClient.java
@@ -61,7 +61,7 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	private String solrUrl;
 	private String solrUser;
 	private String solrPassword;
-	private int solrPingTime; // s
+	private String solrPingCronExpression; // s
 	private CommonsHttpSolrServer server;
 
 	private ApplicationEventPublisher applicationEventPublisher;
@@ -101,13 +101,13 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	{
 		this.applicationEventPublisher = applicationEventPublisher;
 	}
-
-	public void setSolrPingTime(int solrPingTime)
-	{
-		this.solrPingTime = solrPingTime;
-	}
 	
-	public void init()
+	public void setSolrPingCronExpression(String solrPingCronExpression)
+    {
+        this.solrPingCronExpression = solrPingCronExpression;
+    }
+
+    public void init()
 	{
 		try
 		{
@@ -315,7 +315,7 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 		        jobDataMap.put("SOLR_TRACKER", this);
 		        job.setJobDataMap(jobDataMap);
 
-	            trigger = new CronTrigger("SolrWatcherTrigger", "Solr", "0/" + solrPingTime + " * * * * ? *");
+	            trigger = new CronTrigger("SolrWatcherTrigger", "Solr", solrPingCronExpression);
 	            scheduler.scheduleJob(job, trigger);
 	            //stopTimer();
 	    	}