diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
index f0332aa3cdfa8be93914c2acfd7284deb0e11c01..dcdeff0dc95a7f22fd734a1b221dc7cdaf69da0f 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
@@ -268,7 +268,7 @@ public class TaskMasterLifecycle
   public Optional<ResourceManagementScheduler> getResourceManagementScheduler()
   {
     if (leading) {
-      return Optional.of(resourceManagementScheduler);
+      return Optional.fromNullable(resourceManagementScheduler);
     } else {
       return Optional.absent();
     }