diff --git a/source/src/main/java/com/linkedin/uif/source/extractor/extract/BaseSource.java b/source/src/main/java/com/linkedin/uif/source/extractor/extract/BaseSource.java
index <HASH>..<HASH> 100644
--- a/source/src/main/java/com/linkedin/uif/source/extractor/extract/BaseSource.java
+++ b/source/src/main/java/com/linkedin/uif/source/extractor/extract/BaseSource.java
@@ -123,7 +123,10 @@ public abstract class BaseSource<S, D> implements Source<S, D> {
 			}
 		}
 		
-		if(hasDataInPreviousRun) {
+		if(previousWorkUnitStateHighWatermarks.isEmpty()) {
+			latestWaterMark = ConfigurationKeys.DEFAULT_WATERMARK_VALUE;
+			LOG.info("Previous Committed states are not found; Latest watermark - Default watermark:"+latestWaterMark);
+		} else if(hasDataInPreviousRun) {
 			latestWaterMark = Collections.max(previousWorkUnitStateHighWatermarks);
 			LOG.info("Previous run has data; Latest watermark - Max watermark from WorkUnitStates:"+latestWaterMark);
 		} else {
Get default watermark from BaseSource when there are failed or aborted previous states without committed states

RB=<I>
R=stakiar,kgoodhop,lqiao,ynli
A=kgoodhop