diff --git a/src/server/analytic_services/endpoint_group_report_indexes.js b/src/server/analytic_services/endpoint_group_report_indexes.js
index f60927bd5f..4d8a743f14 100644
--- a/src/server/analytic_services/endpoint_group_report_indexes.js
+++ b/src/server/analytic_services/endpoint_group_report_indexes.js
@@ -4,10 +4,10 @@
 module.exports = [{
     fields: {
         start_time: 1,
-        aggregated_time: -1,
-        aggregated_time_range: 1,
+        end_time: 1,
+        group_name: 1,
     },
     options: {
         unique: false,
     }
-}, ];
+}];
diff --git a/src/server/analytic_services/usage_report_indexes.js b/src/server/analytic_services/usage_report_indexes.js
index f60927bd5f..b717bfbd23 100644
--- a/src/server/analytic_services/usage_report_indexes.js
+++ b/src/server/analytic_services/usage_report_indexes.js
@@ -1,13 +1,17 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-module.exports = [{
-    fields: {
-        start_time: 1,
-        aggregated_time: -1,
-        aggregated_time_range: 1,
-    },
-    options: {
-        unique: false,
+module.exports = [
+    // There are many other fields in the table but this is a common denominator
+    // and the hot query uses only these fields.
+    {
+        fields: {
+            start_time: 1,
+            end_time: 1,
+            bucket: 1,
+        },
+        options: {
+            unique: false,
+        }
     }
-}, ];
+];