diff --git a/app/uk/gov/hmrc/apinotificationqueue/repository/NotificationRepository.scala b/app/uk/gov/hmrc/apinotificationqueue/repository/NotificationRepository.scala
index 97cb3d4..e2c2723 100644
--- a/app/uk/gov/hmrc/apinotificationqueue/repository/NotificationRepository.scala
+++ b/app/uk/gov/hmrc/apinotificationqueue/repository/NotificationRepository.scala
@@ -261,7 +261,7 @@ class NotificationMongoRepository @Inject()(mongo: MongoComponent,
 
     collection.aggregate[NotificationWithIdOnly](
       pipeline = Seq(filter, projection)
-    ).toFuture().map(_.toList)
+    ).hintString("clientId-Index").toFuture().map(_.toList)
   }
 
     override def fetchNotificationIds(clientId: String, conversationId: UUID, notificationStatus: NotificationStatus.Value): Future[List[NotificationWithIdOnly]] = {
diff --git a/test/component/QueueSpec.scala b/test/component/QueueSpec.scala
index f0bba3e..f5290ad 100644
--- a/test/component/QueueSpec.scala
+++ b/test/component/QueueSpec.scala
@@ -59,6 +59,7 @@ class QueueSpec extends AnyFeatureSpec
 
   override def beforeEach(): Unit = {
     await(repo.collection.drop().toFuture())
+    await(repo.ensureIndexes())
   }
 
   override def afterEach(): Unit = {