diff --git a/service/integration/obligation_triggers_test.go b/service/integration/obligation_triggers_test.go
index 2141ba2d5..8a9b3dd1d 100644
--- a/service/integration/obligation_triggers_test.go
+++ b/service/integration/obligation_triggers_test.go
@@ -579,6 +579,8 @@ func (s *ObligationTriggersSuite) validateTrigger(actual *policy.ObligationTrigg
 	s.Require().Equal(expectedObligationValue.GetObligation().GetId(), actual.GetObligationValue().GetObligation().GetId())
 	s.Require().Equal(expectedObligationValue.GetObligation().GetName(), actual.GetObligationValue().GetObligation().GetName())
 	s.Require().Equal(expectedObligationValue.GetObligation().GetNamespace().GetFqn(), actual.GetObligationValue().GetObligation().GetNamespace().GetFqn())
+	s.Require().NotEmpty(expectedObligationValue.GetFqn())
+	s.Require().Equal(expectedObligationValue.GetFqn(), actual.GetObligationValue().GetFqn())
 	s.Require().Empty(actual.GetObligationValue().GetTriggers())
 
 	// Validate action
diff --git a/service/policy/db/obligations.go b/service/policy/db/obligations.go
index 339d43df0..6a50758e8 100644
--- a/service/policy/db/obligations.go
+++ b/service/policy/db/obligations.go
@@ -645,6 +645,10 @@ func (c PolicyDBClient) CreateObligationTrigger(ctx context.Context, r *obligati
 		return nil, err
 	}
 
+	if returnedOblVal := trigger.GetObligationValue(); returnedOblVal != nil {
+		returnedOblVal.Fqn = oblVal.GetFqn()
+	}
+
 	trigger.Metadata = metadata
 
 	return trigger, nil
@@ -694,6 +698,9 @@ func (c PolicyDBClient) ListObligationTriggers(ctx context.Context, r *obligatio
 			return nil, nil, err
 		}
 
+		if returnedOblVal := obligationTrigger.GetObligationValue(); returnedOblVal != nil {
+			returnedOblVal.Fqn = identifier.BuildOblValFQN(returnedOblVal.GetObligation().GetNamespace().GetFqn(), returnedOblVal.GetObligation().GetName(), returnedOblVal.GetValue())
+		}
 		obligationTrigger.Metadata = metadata
 		result = append(result, obligationTrigger)
 	}