diff --git a/ScalliGraph b/ScalliGraph
index b46932dddf..4aa2d6084e 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit b46932dddf31d24caf3ca65a462fc86175ac029b
+Subproject commit 4aa2d6084eaca86a8dbc7e078a53a103f0d63c8c
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th3/DBConfiguration.scala b/migration/src/main/scala/org/thp/thehive/migration/th3/DBConfiguration.scala
index 27ef1bea17..59609dc7f0 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/th3/DBConfiguration.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/th3/DBConfiguration.scala
@@ -207,10 +207,10 @@ class DBConfiguration @Inject() (
     */
   lazy val indexName: String = {
     val indexBaseName = config.get[String]("search.index")
-    val index_3_5_1   = indexBaseName + "_16"
-    val index_3_5_0   = indexBaseName + "_15"
+    val index_3_5_1   = indexBaseName + "_17"
+    val index_3_5_0   = indexBaseName + "_16"
     if (exists(index_3_5_1)) index_3_5_1
     else if (exists(index_3_5_0)) index_3_5_0
-    else ???
+    else sys.error(s"TheHive 3.x index $indexBaseName not found")
   }
 }