diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java
index bb4b009d042..8d2e3ef1b71 100755
--- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java
+++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java
@@ -44,6 +44,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -313,7 +314,11 @@ public Trigger find(KapuaId scopeId, KapuaId triggerId) throws KapuaException {
         //
         // Do find
         Trigger trigger = entityManagerSession.doAction(em -> TriggerDAO.find(em, scopeId, triggerId));
-        adaptTrigger(trigger);
+
+        if (trigger != null) {
+            adaptTrigger(trigger);
+        }
+
         return trigger;
     }
 
@@ -431,7 +436,7 @@ private void adaptTriggerCreator(TriggerCreator triggerCreator) throws KapuaExce
      * @throws KapuaException In case that {@link TriggerDefinition} is not found.
      * @since 1.1.0
      */
-    private void adaptTrigger(Trigger trigger) throws KapuaException {
+    private void adaptTrigger(@NotNull Trigger trigger) throws KapuaException {
         boolean converted = false;
         if (trigger.getRetryInterval() != null) {
             trigger.setTriggerDefinitionId(getIntervalJobTriggerDefinition().getId());