diff --git a/server/src/main/java/io/druid/db/DatabaseSegmentManager.java b/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
index 930322106f8d4512e474ce0224e00750190ac521..a8b5b02bc1661c7057c3557ddd91e18b72c5fe23 100644
--- a/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
+++ b/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
@@ -106,7 +106,7 @@ public class DatabaseSegmentManager
       final Duration delay = config.get().getPollDuration().toStandardDuration();
       ScheduledExecutors.scheduleWithFixedDelay(
           exec,
-          delay,
+          new Duration(0),
           delay,
           new Runnable()
           {
diff --git a/server/src/test/java/io/druid/db/DatabaseSegmentManagerTest.java b/server/src/test/java/io/druid/db/DatabaseSegmentManagerTest.java
index 267f86a8a56cc81ad681dacfe42c44bf839d3688..553c1b3946d5d586a6e801feb6be50026562ed46 100644
--- a/server/src/test/java/io/druid/db/DatabaseSegmentManagerTest.java
+++ b/server/src/test/java/io/druid/db/DatabaseSegmentManagerTest.java
@@ -106,7 +106,7 @@ public class DatabaseSegmentManagerTest
   @Test
   public void testPoll()
   {
-    EasyMock.expect(dbi.withHandle(EasyMock.<HandleCallback>anyObject())).andReturn(testRows);
+    EasyMock.expect(dbi.withHandle(EasyMock.<HandleCallback>anyObject())).andReturn(testRows).times(2);
     EasyMock.replay(dbi);
 
     manager.start();