diff --git a/thehive/app/org/thp/thehive/services/CaseSrv.scala b/thehive/app/org/thp/thehive/services/CaseSrv.scala
index d2e2e0c88f..7acf6b7358 100644
--- a/thehive/app/org/thp/thehive/services/CaseSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CaseSrv.scala
@@ -54,7 +54,7 @@ class CaseSrv @Inject() (
 
   override def createEntity(e: Case)(implicit graph: Graph, authContext: AuthContext): Try[Case with Entity] =
     super.createEntity(e).map { `case` =>
-      integrityCheckActor ! IntegrityCheckActor.EntityAdded("Case")
+      integrityCheckActor ! EntityAdded("Case")
       `case`
     }
 
diff --git a/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala b/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
index 22e4b17ad5..2ae5d464a1 100644
--- a/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
@@ -42,7 +42,7 @@ class CaseTemplateSrv @Inject() (
     startTraversal.getByName(name)
 
   override def createEntity(e: CaseTemplate)(implicit graph: Graph, authContext: AuthContext): Try[CaseTemplate with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("CaseTemplate")
+    integrityCheckActor ! EntityAdded("CaseTemplate")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
index 7a1bffbd75..51be2623bc 100644
--- a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
@@ -25,7 +25,7 @@ class CustomFieldSrv @Inject() (auditSrv: AuditSrv, organisationSrv: Organisatio
 ) extends VertexSrv[CustomField] {
 
   override def createEntity(e: CustomField)(implicit graph: Graph, authContext: AuthContext): Try[CustomField with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("CustomField")
+    integrityCheckActor ! EntityAdded("CustomField")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/DataSrv.scala b/thehive/app/org/thp/thehive/services/DataSrv.scala
index b1a75c3a4d..1471129e20 100644
--- a/thehive/app/org/thp/thehive/services/DataSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DataSrv.scala
@@ -21,7 +21,7 @@ class DataSrv @Inject() (@Named("integrity-check-actor") integrityCheckActor: Ac
     extends VertexSrv[Data] {
   override def createEntity(e: Data)(implicit graph: Graph, authContext: AuthContext): Try[Data with Entity] =
     super.createEntity(e).map { data =>
-      integrityCheckActor ! IntegrityCheckActor.EntityAdded("Data")
+      integrityCheckActor ! EntityAdded("Data")
       data
     }
 
diff --git a/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala b/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
index 490ad61f6b..43b9ab1a33 100644
--- a/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
@@ -23,7 +23,7 @@ class ImpactStatusSrv @Inject() (@Named("integrity-check-actor") integrityCheckA
     startTraversal.getByName(name)
 
   override def createEntity(e: ImpactStatus)(implicit graph: Graph, authContext: AuthContext): Try[ImpactStatus with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("ImpactStatus")
+    integrityCheckActor ! EntityAdded("ImpactStatus")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala b/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
index 208c9db491..401dbf8dcc 100644
--- a/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
+++ b/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
@@ -18,14 +18,12 @@ import scala.collection.immutable
 import scala.concurrent.duration.{Duration, FiniteDuration}
 import scala.util.Success
 
-object IntegrityCheckActor {
-  case class EntityAdded(name: String)
-}
+sealed trait IntegrityCheckMessage
+case class EntityAdded(name: String) extends IntegrityCheckMessage
 
 class IntegrityCheckActor() extends Actor {
   case class NeedCheck(name: String)
   case class Check(name: String)
-  import IntegrityCheckActor._
 
   lazy val logger: Logger               = Logger(getClass)
   lazy val injector: Injector           = GuiceAkkaExtension(context.system).injector
@@ -44,10 +42,8 @@ class IntegrityCheckActor() extends Actor {
   def interval(name: String): FiniteDuration =
     configuration.getOptional[FiniteDuration](s"integrityCheck.$name.interval").getOrElse(defaultInitalDelay)
 
-  lazy val integrityCheckMap: Map[String, IntegrityCheckOps[_]] = {
-
+  lazy val integrityCheckMap: Map[String, IntegrityCheckOps[_]] =
     integrityCheckOps.map(d => d.name -> d).toMap
-  }
   def check(name: String): Unit = integrityCheckMap.get(name).foreach(_.check())
 
   override def preStart(): Unit = {
diff --git a/thehive/app/org/thp/thehive/services/IntegrityCheckSerializer.scala b/thehive/app/org/thp/thehive/services/IntegrityCheckSerializer.scala
new file mode 100644
index 0000000000..9375fc7fa7
--- /dev/null
+++ b/thehive/app/org/thp/thehive/services/IntegrityCheckSerializer.scala
@@ -0,0 +1,23 @@
+package org.thp.thehive.services
+
+import akka.serialization.Serializer
+
+import java.io.NotSerializableException
+
+class IntegrityCheckSerializer extends Serializer {
+  override def identifier: Int = -604584588
+
+  override def includeManifest: Boolean = false
+
+  override def toBinary(o: AnyRef): Array[Byte] =
+    o match {
+      case EntityAdded(name) => 0.toByte +: name.getBytes
+      case _                 => throw new NotSerializableException
+    }
+
+  override def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef =
+    bytes(0) match {
+      case 0 => EntityAdded(new String(bytes.tail))
+      case _ => throw new NotSerializableException
+    }
+}
diff --git a/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala b/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
index 6b7fafc470..1a3c2fff26 100644
--- a/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
@@ -27,7 +27,7 @@ class ObservableTypeSrv @Inject() (@Named("integrity-check-actor") integrityChec
   override def exists(e: ObservableType)(implicit graph: Graph): Boolean = startTraversal.getByName(e.name).exists
 
   override def createEntity(e: ObservableType)(implicit graph: Graph, authContext: AuthContext): Try[ObservableType with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("ObservableType")
+    integrityCheckActor ! EntityAdded("ObservableType")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
index 69af5f84de..8e4cb0cd04 100644
--- a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
+++ b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
@@ -36,7 +36,7 @@ class OrganisationSrv @Inject() (
   val organisationShareSrv        = new EdgeSrv[OrganisationShare, Organisation, Share]
 
   override def createEntity(e: Organisation)(implicit graph: Graph, authContext: AuthContext): Try[Organisation with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("Organisation")
+    integrityCheckActor ! EntityAdded("Organisation")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/ProfileSrv.scala b/thehive/app/org/thp/thehive/services/ProfileSrv.scala
index 0a066028b6..e0941b7581 100644
--- a/thehive/app/org/thp/thehive/services/ProfileSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ProfileSrv.scala
@@ -29,7 +29,7 @@ class ProfileSrv @Inject() (
   lazy val orgAdmin: Profile with Entity    = db.roTransaction(graph => getOrFail(EntityName(Profile.orgAdmin.name))(graph)).get
 
   override def createEntity(e: Profile)(implicit graph: Graph, authContext: AuthContext): Try[Profile with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("Profile")
+    integrityCheckActor ! EntityAdded("Profile")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala b/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
index d66d6e1ce4..02e8bbc873 100644
--- a/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
@@ -23,7 +23,7 @@ class ResolutionStatusSrv @Inject() (@Named("integrity-check-actor") integrityCh
     startTraversal.getByName(name)
 
   override def createEntity(e: ResolutionStatus)(implicit graph: Graph, authContext: AuthContext): Try[ResolutionStatus with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("Resolution")
+    integrityCheckActor ! EntityAdded("Resolution")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/TagSrv.scala b/thehive/app/org/thp/thehive/services/TagSrv.scala
index a035558eaa..9620a7b3d0 100644
--- a/thehive/app/org/thp/thehive/services/TagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TagSrv.scala
@@ -53,7 +53,7 @@ class TagSrv @Inject() (appConfig: ApplicationConfig, @Named("integrity-check-ac
   }
 
   override def createEntity(e: Tag)(implicit graph: Graph, authContext: AuthContext): Try[Tag with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("Tag")
+    integrityCheckActor ! EntityAdded("Tag")
     super.createEntity(e)
   }
 
diff --git a/thehive/app/org/thp/thehive/services/UserSrv.scala b/thehive/app/org/thp/thehive/services/UserSrv.scala
index 0fb1f1e743..b236698813 100644
--- a/thehive/app/org/thp/thehive/services/UserSrv.scala
+++ b/thehive/app/org/thp/thehive/services/UserSrv.scala
@@ -42,7 +42,7 @@ class UserSrv @Inject() (
   val userAttachmentSrv = new EdgeSrv[UserAttachment, User, Attachment]
 
   override def createEntity(e: User)(implicit graph: Graph, authContext: AuthContext): Try[User with Entity] = {
-    integrityCheckActor ! IntegrityCheckActor.EntityAdded("User")
+    integrityCheckActor ! EntityAdded("User")
     super.createEntity(e)
   }