diff --git a/src/main/java/au/com/royalpay/payment/manage/task/CheckPartnerAuthStatusAndSendMessageTask.java b/src/main/java/au/com/royalpay/payment/manage/task/CheckPartnerAuthStatusAndSendMessageTask.java
index 5ffffa1b8..d8b18c490 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/CheckPartnerAuthStatusAndSendMessageTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/CheckPartnerAuthStatusAndSendMessageTask.java
@@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.task;
 
 import au.com.royalpay.payment.manage.application.core.SimpleClientService;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -11,6 +12,7 @@ import javax.annotation.Resource;
  * Created by yishuqian on 12/03/2017.
  */
 @Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
 public class CheckPartnerAuthStatusAndSendMessageTask {
     @Resource
     private SimpleClientService simpleClientService;
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java b/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java
index fba6d04bb..310e266b4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java
@@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.analysis.core.DailyReport;
 
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -15,6 +16,7 @@ import javax.annotation.Resource;
  * Created by yixian on 2017-03-07.
  */
 @Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
 public class DailyReportGenerationTask {
 
     @Resource
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java b/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java
index ef2da42f6..572a5a142 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java
@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.task;
 import au.com.royalpay.payment.manage.analysis.core.DashboardService;
 
 import org.apache.commons.lang.time.DateUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
  * Created by yixian on 2016-11-14.
  */
 @Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
 public class DashboardTaskManager {
     @Resource
     private DashboardService dashboardService;
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java b/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java
index 9bc4d5b90..b41cd6e6a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java
@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.task;
 import au.com.royalpay.payment.manage.analysis.core.CustomersAnalysisService;
 
 import org.apache.commons.lang.time.DateUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
  * Created by yixian on 2016-11-14.
  */
 @Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
 public class PartnerTransactionsDailyMsgTaskManager {
     @Resource
     private CustomersAnalysisService customersAnalysisService;
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/RedPackTaskManager.java b/src/main/java/au/com/royalpay/payment/manage/task/RedPackTaskManager.java
index 388b60fbd..76bc2607b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/RedPackTaskManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/RedPackTaskManager.java
@@ -15,6 +15,7 @@ import javax.annotation.Resource;
  * Created by yishuqian on 01/02/2017.
  */
 @Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
 public class RedPackTaskManager {
     private Logger logger = LoggerFactory.getLogger(getClass());