diff --git a/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java b/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
index 2b5abf9..bc05a24 100644
--- a/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
@@ -150,7 +150,7 @@
         Event testEvent = new Event("test-event-type", null, profile, null, null, profile, Date.from(localDate.atStartOfDay(defaultZoneId).toInstant()));
         testEvent.setPersistent(true);
         eventService.send(testEvent);
-        persistenceService.refreshIndex(Event.class, null); // wait for event to be fully persisted and indexed
+        persistenceService.refreshIndex(Event.class, new Date()); // wait for event to be fully persisted and indexed
 
         // create the segment
         Metadata segmentMetadata = new Metadata("past-event-segment-test");
diff --git a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 2ec7d2d..f628a8c 100644
--- a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -41,6 +41,7 @@
             <cm:property name="monthlyIndex.numberOfReplicas" value="0"/>
             <cm:property name="monthlyIndex.indexMappingTotalFieldsLimit" value="1000"/>
             <cm:property name="monthlyIndex.indexMaxDocValueFieldsSearch" value="1000"/>
+            <cm:property name="monthlyIndex.itemsMonthlyIndexedOverride" value="event,session"/>
             <cm:property name="defaultQueryLimit" value="10"/>
 
             <cm:property name="bulkProcessor.concurrentRequests" value="1" />