diff --git a/migration/src/main/scala/org/thp/thehive/cloner/IntegrityCheckApp.scala b/migration/src/main/scala/org/thp/thehive/cloner/IntegrityCheckApp.scala
index a4e09d7ada..edb6daf8cc 100644
--- a/migration/src/main/scala/org/thp/thehive/cloner/IntegrityCheckApp.scala
+++ b/migration/src/main/scala/org/thp/thehive/cloner/IntegrityCheckApp.scala
@@ -59,6 +59,7 @@ trait IntegrityCheckApp {
               integrityCheckOpsBindings.addBinding.to[TagIntegrityCheck]
               integrityCheckOpsBindings.addBinding.to[TaskIntegrityCheck]
               integrityCheckOpsBindings.addBinding.to[UserIntegrityCheck]
+              integrityCheckOpsBindings.addBinding.to[RoleIntegrityCheck]
 
               bind[Environment].toInstance(Environment.simple())
               bind[ApplicationLifecycle].to[DefaultApplicationLifecycle]
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
index 605f1f5dbc..2b4e6b7d8b 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
@@ -73,6 +73,7 @@ object Output {
               integrityCheckOpsBindings.addBinding.to[TagIntegrityCheck]
               integrityCheckOpsBindings.addBinding.to[TaskIntegrityCheck]
               integrityCheckOpsBindings.addBinding.to[UserIntegrityCheck]
+              integrityCheckOpsBindings.addBinding.to[RoleIntegrityCheck]
 
               val schemaBindings = ScalaMultibinder.newSetBinder[UpdatableSchema](binder)
               schemaBindings.addBinding.to[TheHiveSchemaDefinition]
diff --git a/thehive/app/org/thp/thehive/TheHiveModule.scala b/thehive/app/org/thp/thehive/TheHiveModule.scala
index b28ec07eec..7f585595b5 100644
--- a/thehive/app/org/thp/thehive/TheHiveModule.scala
+++ b/thehive/app/org/thp/thehive/TheHiveModule.scala
@@ -104,6 +104,7 @@ class TheHiveModule(environment: Environment, configuration: Configuration) exte
     integrityChecksBindings.addBinding.to[TaskIntegrityCheck]
     integrityChecksBindings.addBinding.to[ObservableIntegrityCheck]
     integrityChecksBindings.addBinding.to[LogIntegrityCheck]
+    integrityChecksBindings.addBinding.to[RoleIntegrityCheck]
     bind[TypedActorRef[IntegrityCheck.Request]].toProvider[IntegrityCheckActorProvider].asEagerSingleton()
     bind[TypedActorRef[CaseNumberActor.Request]].toProvider[CaseNumberActorProvider]
 
diff --git a/thehive/app/org/thp/thehive/services/RoleSrv.scala b/thehive/app/org/thp/thehive/services/RoleSrv.scala
index 7d58b977b3..005403ac4e 100644
--- a/thehive/app/org/thp/thehive/services/RoleSrv.scala
+++ b/thehive/app/org/thp/thehive/services/RoleSrv.scala
@@ -53,3 +53,20 @@ object RoleOps {
 
   }
 }
+
+@Singleton
+class RoleIntegrityCheck @Inject() (
+    val db: Database,
+    val service: RoleSrv,
+    profileSrv: ProfileSrv,
+    organisationSrv: OrganisationSrv,
+    roleSrv: RoleSrv
+) extends GlobalCheck[Role]
+    with IntegrityCheckOps[Role] {
+  override def globalCheck(traversal: Traversal.V[Role])(implicit graph: Graph): Map[String, Long] = {
+    val orgOphanCount      = service.startTraversal.filterNot(_.organisation).sideEffect(_.drop()).getCount
+    val userOrphanCount    = service.startTraversal.filterNot(_.user).sideEffect(_.drop()).getCount
+    val profileOrphanCount = service.startTraversal.filterNot(_.profile).sideEffect(_.drop()).getCount
+    Map("orgOrphan" -> orgOphanCount, "userOrphan" -> userOrphanCount, "profileOrphan" -> profileOrphanCount)
+  }
+}
diff --git a/thehive/conf/reference.conf b/thehive/conf/reference.conf
index 4e1dffaa8d..78ee933596 100644
--- a/thehive/conf/reference.conf
+++ b/thehive/conf/reference.conf
@@ -236,6 +236,12 @@ integrityCheck {
       minInterval: 30 minutes
       dedupStrategy: AfterAddition
     }
+    Role {
+      enabled: true
+      initialDelay: 30 seconds
+      minInterval: 1 minute
+      dedupStrategy: AfterAddition
+    }
   }
 }
 
diff --git a/thehive/test/org/thp/thehive/TestAppBuilder.scala b/thehive/test/org/thp/thehive/TestAppBuilder.scala
index 208fcaa035..2b26d249cc 100644
--- a/thehive/test/org/thp/thehive/TestAppBuilder.scala
+++ b/thehive/test/org/thp/thehive/TestAppBuilder.scala
@@ -58,7 +58,8 @@ trait TestAppBuilder {
         classOf[CaseTemplateIntegrityCheck],
         classOf[DataIntegrityCheck],
         classOf[CaseIntegrityCheck],
-        classOf[AlertIntegrityCheck]
+        classOf[AlertIntegrityCheck],
+        classOf[RoleIntegrityCheck]
       )
       .bindActor[DummyActor]("config-actor")
       .bindActor[DummyActor]("notification-actor")