diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/task/JobService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/task/JobService.java
index 5581f1eac7..a28b0e391a 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/task/JobService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/task/JobService.java
@@ -21,8 +21,9 @@ import org.thingsboard.server.common.data.job.Job;
 import org.thingsboard.server.common.data.job.JobStats;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.entity.EntityDaoService;
 
-public interface JobService {
+public interface JobService extends EntityDaoService {
 
     Job createJob(TenantId tenantId, Job job);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/task/DefaultJobService.java b/dao/src/main/java/org/thingsboard/server/dao/task/DefaultJobService.java
index 12d81c1c2c..dba569daa8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/task/DefaultJobService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/task/DefaultJobService.java
@@ -18,6 +18,9 @@ package org.thingsboard.server.dao.task;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.JobId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.job.Job;
@@ -31,6 +34,8 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
 
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -113,4 +118,14 @@ public class DefaultJobService implements JobService {
 
     }
 
+    @Override
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findJobById(tenantId, new JobId(entityId.getId())));
+    }
+
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.JOB;
+    }
+
 }