diff --git a/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/LeaderScheduler.java b/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/LeaderScheduler.java
index 9a9b17ffa6..b2af9285b2 100644
--- a/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/LeaderScheduler.java
+++ b/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/LeaderScheduler.java
@@ -107,10 +107,6 @@ public void run() {
 
                         // Step 3: Find and create children partitions.
                         compareAndCreateChildrenPartitions(sourcePartitions);
-
-                        // Extend the timeout
-                        // will always be a leader until shutdown
-                        coordinator.saveProgressStateForPartition(leaderPartition, Duration.ofMinutes(DEFAULT_EXTEND_LEASE_MINUTES));
                     }
 
                 }
@@ -118,6 +114,9 @@ public void run() {
             } catch (Exception e) {
                 LOG.error("Exception occurred in primary scheduling loop", e);
             } finally {
+                // Extend the timeout
+                // will always be a leader until shutdown
+                coordinator.saveProgressStateForPartition(leaderPartition, Duration.ofMinutes(DEFAULT_EXTEND_LEASE_MINUTES));
                 try {
                     Thread.sleep(DEFAULT_LEASE_INTERVAL_MILLIS);
                 } catch (final InterruptedException e) {
@@ -178,7 +177,6 @@ private void init() {
         LeaderProgressState leaderProgressState = leaderPartition.getProgressState().get();
         leaderProgressState.setStreamArns(streamArns);
         leaderProgressState.setInitialized(true);
-        coordinator.saveProgressStateForPartition(leaderPartition, Duration.ofMinutes(DEFAULT_EXTEND_LEASE_MINUTES));
     }
 
 
@@ -212,7 +210,7 @@ private void compareAndCreateChildrenPartitions(List<EnhancedSourcePartition> so
             }
         });
         long endTime = System.currentTimeMillis();
-        LOG.info("Compare and create children partitions took {} milliseconds", endTime - startTime);
+        LOG.debug("Compare and create children partitions took {} milliseconds", endTime - startTime);
     }
 
 
diff --git a/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/ShardManager.java b/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/ShardManager.java
index d7a941ebe7..36fcec8f81 100644
--- a/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/ShardManager.java
+++ b/data-prepper-plugins/dynamodb-source/src/main/java/org/opensearch/dataprepper/plugins/source/dynamodb/leader/ShardManager.java
@@ -166,7 +166,7 @@ private List<Shard> listShards(String streamArn, String lastEvaluatedShardId) {
         } while (lastEvaluatedShardId != null);
 
         long endTime = System.currentTimeMillis();
-        LOG.info("Listing shards (DescribeStream call) took {} milliseconds with {} shards found, ", endTime - startTime, shards.size());
+        LOG.info("Listing shards (DescribeStream call) took {} milliseconds with {} shards found", endTime - startTime, shards.size());
         return shards;
     }