diff --git a/thehive/app/org/thp/thehive/services/AlertSrv.scala b/thehive/app/org/thp/thehive/services/AlertSrv.scala
index 1323b88bc1..5772d21d5f 100644
--- a/thehive/app/org/thp/thehive/services/AlertSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AlertSrv.scala
@@ -237,7 +237,7 @@ class AlertSrv @Inject() (
       graph: Graph,
       authContext: AuthContext
   ): Try[RichCase] =
-    get(alert.alert).`case`.richCase.headOption.getOrElse {
+    get(alert.alert).`case`.richCase.getOrFail("Case").orElse {
       for {
         caseTemplate <-
           alert