diff --git a/wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java
index 7760e15e23..6a13ffdb37 100644
--- a/wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java
+++ b/wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java
@@ -117,6 +117,7 @@ public class DictDatasetDao extends BaseDao {
 
     String[] urnParts = parseWhDatasetUrn(urn);
     ds.setDatasetType(urnParts[0]);
+    ds.setSource(urnParts[0]);
     ds.setLocationPrefix(urnParts[1]);
     ds.setParentName(urnParts[2]);
     ds.setName(urnParts[3]);
@@ -161,8 +162,6 @@ public class DictDatasetDao extends BaseDao {
       }
 
       // if schema is not in the MCE, will not update the source section of the dataset
-      String actor = getUrnEntity(toStringOrNull(auditStamp.actorUrn));
-      ds.setSource(actor);
       int sourceTime = (int) (auditStamp.time / 1000);
       if (ds.getSourceCreatedTime() == null) {
         ds.setSourceCreatedTime(sourceTime);
diff --git a/wherehows-dao/src/test/java/wherehows/dao/DictDatasetDaoTest.java b/wherehows-dao/src/test/java/wherehows/dao/DictDatasetDaoTest.java
index 0b61584eb3..6e4904ff63 100644
--- a/wherehows-dao/src/test/java/wherehows/dao/DictDatasetDaoTest.java
+++ b/wherehows-dao/src/test/java/wherehows/dao/DictDatasetDaoTest.java
@@ -56,7 +56,7 @@ public class DictDatasetDaoTest {
     dictDatasetDao.fillDictDataset(ds, urn, auditStamp, null, null, null, null, null, null);
 
     assertEquals(ds.getUrn(), urn);
-    assertEquals(ds.getSource(), null);
+    assertEquals(ds.getSource(), "oracle");
     assertTrue(ds.getIsActive());
 
     DatasetSchema schema = new DatasetSchema();
@@ -67,7 +67,6 @@ public class DictDatasetDaoTest {
 
     dictDatasetDao.fillDictDataset(ds, urn, auditStamp, null, schema, null, null, null, null);
 
-    assertEquals(ds.getSource(), "tester");
     assertEquals(ds.getSourceCreatedTime().intValue(), testTime / 1000);
     assertEquals(ds.getSourceModifiedTime().intValue(), testTime / 1000);
     assertEquals(ds.getCreatedTime(), null);
@@ -146,7 +145,6 @@ public class DictDatasetDaoTest {
 
     Long testTime2 = System.currentTimeMillis();
     auditStamp.time = testTime2;
-    auditStamp.actorUrn = "urn:li:user:tester2";
 
     DatasetProperty property2 = new DatasetProperty();
     property2.nativeType = PlatformNativeType.TABLE;
@@ -165,7 +163,6 @@ public class DictDatasetDaoTest {
 
     dictDatasetDao.fillDictDataset(ds, urn, auditStamp, property2, schema, null, tags2, null, partitions);
 
-    assertEquals(ds.getSource(), "tester2");
     assertEquals(ds.getSourceCreatedTime().intValue(), testTime1 / 1000);
     assertEquals(ds.getSourceModifiedTime().intValue(), testTime2 / 1000);