diff --git a/thehive/app/org/thp/thehive/services/AlertSrv.scala b/thehive/app/org/thp/thehive/services/AlertSrv.scala
index 6768a009e2..1323b88bc1 100644
--- a/thehive/app/org/thp/thehive/services/AlertSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AlertSrv.scala
@@ -236,33 +236,35 @@ class AlertSrv @Inject() (
   def createCase(alert: RichAlert, user: Option[User with Entity], organisation: Organisation with Entity)(implicit
       graph: Graph,
       authContext: AuthContext
-  ): Try[RichCase] = // FIXME check if alert is already imported
-    for {
-      caseTemplate <-
-        alert
-          .caseTemplate
-          .map(ct => caseTemplateSrv.get(EntityIdOrName(ct)).richCaseTemplate.getOrFail("CaseTemplate"))
-          .flip
-      customField = alert.customFields.map(f => InputCustomFieldValue(f.name, f.value, f.order))
-      case0 = Case(
-        number = 0,
-        title = caseTemplate.flatMap(_.titlePrefix).getOrElse("") + alert.title,
-        description = alert.description,
-        severity = alert.severity,
-        startDate = new Date,
-        endDate = None,
-        flag = false,
-        tlp = alert.tlp,
-        pap = alert.pap,
-        status = CaseStatus.Open,
-        summary = None
-      )
+  ): Try[RichCase] =
+    get(alert.alert).`case`.richCase.headOption.getOrElse {
+      for {
+        caseTemplate <-
+          alert
+            .caseTemplate
+            .map(ct => caseTemplateSrv.get(EntityIdOrName(ct)).richCaseTemplate.getOrFail("CaseTemplate"))
+            .flip
+        customField = alert.customFields.map(f => InputCustomFieldValue(f.name, f.value, f.order))
+        case0 = Case(
+          number = 0,
+          title = caseTemplate.flatMap(_.titlePrefix).getOrElse("") + alert.title,
+          description = alert.description,
+          severity = alert.severity,
+          startDate = new Date,
+          endDate = None,
+          flag = false,
+          tlp = alert.tlp,
+          pap = alert.pap,
+          status = CaseStatus.Open,
+          summary = None
+        )
 
-      createdCase <- caseSrv.create(case0, user, organisation, alert.tags.toSet, customField, caseTemplate, Nil)
-      _           <- importObservables(alert.alert, createdCase.`case`)
-      _           <- alertCaseSrv.create(AlertCase(), alert.alert, createdCase.`case`)
-      _           <- markAsRead(alert._id)
-    } yield createdCase
+        createdCase <- caseSrv.create(case0, user, organisation, alert.tags.toSet, customField, caseTemplate, Nil)
+        _           <- importObservables(alert.alert, createdCase.`case`)
+        _           <- alertCaseSrv.create(AlertCase(), alert.alert, createdCase.`case`)
+        _           <- markAsRead(alert._id)
+      } yield createdCase
+    }
 
   def mergeInCase(alertId: EntityIdOrName, caseId: EntityIdOrName)(implicit graph: Graph, authContext: AuthContext): Try[Case with Entity] =
     for {
diff --git a/thehive/conf/play/reference-overrides.conf b/thehive/conf/play/reference-overrides.conf
index 56d57e05b1..4581bd5806 100644
--- a/thehive/conf/play/reference-overrides.conf
+++ b/thehive/conf/play/reference-overrides.conf
@@ -16,6 +16,8 @@ play.http.session.cookieName = THEHIVE-SESSION
 
 play.server.provider = org.thp.thehive.CustomAkkaHttpServerProvider
 
+play.server.http.idleTimeout = 10 minutes
+
 akka.actor {
   serializers {
     stream = "org.thp.thehive.services.StreamSerializer"