diff --git a/frontend/src/Indexer/Stats/IndexerStats.tsx b/frontend/src/Indexer/Stats/IndexerStats.tsx
index f7b4a9413..77ac3ea85 100644
--- a/frontend/src/Indexer/Stats/IndexerStats.tsx
+++ b/frontend/src/Indexer/Stats/IndexerStats.tsx
@@ -32,136 +32,123 @@ import IndexerStatsFilterModal from './IndexerStatsFilterModal';
 import styles from './IndexerStats.css';
 
 function getAverageResponseTimeData(indexerStats: IndexerStatsIndexer[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.indexerName,
-      value: indexer.averageResponseTime,
-    };
-  });
+  const statistics = [...indexerStats].sort((a, b) =>
+    a.averageResponseTime === b.averageResponseTime
+      ? b.averageGrabResponseTime - a.averageGrabResponseTime
+      : b.averageResponseTime - a.averageResponseTime
+  );
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
+  return {
+    labels: statistics.map((indexer) => indexer.indexerName),
+    datasets: [
+      {
+        label: translate('AverageQueries'),
+        data: statistics.map((indexer) => indexer.averageResponseTime),
+      },
+      {
+        label: translate('AverageGrabs'),
+        data: statistics.map((indexer) => indexer.averageGrabResponseTime),
+      },
+    ],
+  };
 }
 
 function getFailureRateData(indexerStats: IndexerStatsIndexer[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.indexerName,
-      value:
-        (indexer.numberOfFailedQueries +
-          indexer.numberOfFailedRssQueries +
-          indexer.numberOfFailedAuthQueries +
-          indexer.numberOfFailedGrabs) /
-        (indexer.numberOfQueries +
-          indexer.numberOfRssQueries +
-          indexer.numberOfAuthQueries +
-          indexer.numberOfGrabs),
-    };
-  });
+  const data = indexerStats.map((indexer) => ({
+    label: indexer.indexerName,
+    value:
+      (indexer.numberOfFailedQueries +
+        indexer.numberOfFailedRssQueries +
+        indexer.numberOfFailedAuthQueries +
+        indexer.numberOfFailedGrabs) /
+      (indexer.numberOfQueries +
+        indexer.numberOfRssQueries +
+        indexer.numberOfAuthQueries +
+        indexer.numberOfGrabs),
+  }));
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
+  data.sort((a, b) => b.value - a.value);
 
   return data;
 }
 
 function getTotalRequestsData(indexerStats: IndexerStatsIndexer[]) {
-  const data = {
-    labels: indexerStats.map((indexer) => indexer.indexerName),
+  const statistics = [...indexerStats].sort((a, b) =>
+    a.numberOfQueries === b.numberOfQueries
+      ? b.numberOfRssQueries - a.numberOfRssQueries
+      : b.numberOfQueries - a.numberOfQueries
+  );
+
+  return {
+    labels: statistics.map((indexer) => indexer.indexerName),
     datasets: [
       {
         label: translate('SearchQueries'),
-        data: indexerStats.map((indexer) => indexer.numberOfQueries),
+        data: statistics.map((indexer) => indexer.numberOfQueries),
       },
       {
         label: translate('RssQueries'),
-        data: indexerStats.map((indexer) => indexer.numberOfRssQueries),
+        data: statistics.map((indexer) => indexer.numberOfRssQueries),
       },
       {
         label: translate('AuthQueries'),
-        data: indexerStats.map((indexer) => indexer.numberOfAuthQueries),
+        data: statistics.map((indexer) => indexer.numberOfAuthQueries),
       },
     ],
   };
-
-  return data;
 }
 
 function getNumberGrabsData(indexerStats: IndexerStatsIndexer[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.indexerName,
-      value: indexer.numberOfGrabs - indexer.numberOfFailedGrabs,
-    };
-  });
+  const data = indexerStats.map((indexer) => ({
+    label: indexer.indexerName,
+    value: indexer.numberOfGrabs - indexer.numberOfFailedGrabs,
+  }));
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
+  data.sort((a, b) => b.value - a.value);
 
   return data;
 }
 
 function getUserAgentGrabsData(indexerStats: IndexerStatsUserAgent[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.userAgent ? indexer.userAgent : 'Other',
-      value: indexer.numberOfGrabs,
-    };
-  });
+  const data = indexerStats.map((indexer) => ({
+    label: indexer.userAgent ? indexer.userAgent : 'Other',
+    value: indexer.numberOfGrabs,
+  }));
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
+  data.sort((a, b) => b.value - a.value);
 
   return data;
 }
 
 function getUserAgentQueryData(indexerStats: IndexerStatsUserAgent[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.userAgent ? indexer.userAgent : 'Other',
-      value: indexer.numberOfQueries,
-    };
-  });
+  const data = indexerStats.map((indexer) => ({
+    label: indexer.userAgent ? indexer.userAgent : 'Other',
+    value: indexer.numberOfQueries,
+  }));
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
+  data.sort((a, b) => b.value - a.value);
 
   return data;
 }
 
 function getHostGrabsData(indexerStats: IndexerStatsHost[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.host ? indexer.host : 'Other',
-      value: indexer.numberOfGrabs,
-    };
-  });
+  const data = indexerStats.map((indexer) => ({
+    label: indexer.host ? indexer.host : 'Other',
+    value: indexer.numberOfGrabs,
+  }));
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
+  data.sort((a, b) => b.value - a.value);
 
   return data;
 }
 
 function getHostQueryData(indexerStats: IndexerStatsHost[]) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.host ? indexer.host : 'Other',
-      value: indexer.numberOfQueries,
-    };
-  });
+  const data = indexerStats.map((indexer) => ({
+    label: indexer.host ? indexer.host : 'Other',
+    value: indexer.numberOfQueries,
+  }));
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
+  data.sort((a, b) => b.value - a.value);
 
   return data;
 }
@@ -294,7 +281,7 @@ function IndexerStats() {
             </div>
             <div className={styles.fullWidthChart}>
               <div className={styles.chartContainer}>
-                <BarChart
+                <StackedBarChart
                   data={getAverageResponseTimeData(item.indexers)}
                   title={translate('AverageResponseTimesMs')}
                   stepSize={100}
diff --git a/frontend/src/typings/IndexerStats.ts b/frontend/src/typings/IndexerStats.ts
index 74fa1862e..ddbcebaec 100644
--- a/frontend/src/typings/IndexerStats.ts
+++ b/frontend/src/typings/IndexerStats.ts
@@ -2,6 +2,7 @@ export interface IndexerStatsIndexer {
   indexerId: number;
   indexerName: string;
   averageResponseTime: number;
+  averageGrabResponseTime: number;
   numberOfQueries: number;
   numberOfGrabs: number;
   numberOfRssQueries: number;
diff --git a/src/NzbDrone.Core/IndexerStats/IndexerStatistics.cs b/src/NzbDrone.Core/IndexerStats/IndexerStatistics.cs
index 261d0052a..76cbfd616 100644
--- a/src/NzbDrone.Core/IndexerStats/IndexerStatistics.cs
+++ b/src/NzbDrone.Core/IndexerStats/IndexerStatistics.cs
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.IndexerStats
         public int IndexerId { get; set; }
         public string IndexerName { get; set; }
         public int AverageResponseTime { get; set; }
+        public int AverageGrabResponseTime { get; set; }
         public int NumberOfQueries { get; set; }
         public int NumberOfGrabs { get; set; }
         public int NumberOfRssQueries { get; set; }
diff --git a/src/NzbDrone.Core/IndexerStats/IndexerStatisticsService.cs b/src/NzbDrone.Core/IndexerStats/IndexerStatisticsService.cs
index 1af86ab1c..bfaa6e508 100644
--- a/src/NzbDrone.Core/IndexerStats/IndexerStatisticsService.cs
+++ b/src/NzbDrone.Core/IndexerStats/IndexerStatisticsService.cs
@@ -61,13 +61,8 @@ namespace NzbDrone.Core.IndexerStats
                     .ThenBy(v => v.Id)
                     .ToArray();
 
-                var temp = 0;
-                var elapsedTimeEvents = sortedEvents
-                    .Where(h => int.TryParse(h.Data.GetValueOrDefault("elapsedTime"), out temp) && h.Data.GetValueOrDefault("cached") != "1")
-                    .Select(_ => temp)
-                    .ToArray();
-
-                indexerStats.AverageResponseTime = elapsedTimeEvents.Any() ? (int)elapsedTimeEvents.Average() : 0;
+                indexerStats.AverageResponseTime = CalculateAverageElapsedTime(sortedEvents.Where(h => h.EventType is HistoryEventType.IndexerRss or HistoryEventType.IndexerQuery).ToArray());
+                indexerStats.AverageGrabResponseTime = CalculateAverageElapsedTime(sortedEvents.Where(h => h.EventType is HistoryEventType.ReleaseGrabbed).ToArray());
 
                 foreach (var historyEvent in sortedEvents)
                 {
@@ -176,5 +171,17 @@ namespace NzbDrone.Core.IndexerStats
                 HostStatistics = hostStatsList
             };
         }
+
+        private static int CalculateAverageElapsedTime(History.History[] sortedEvents)
+        {
+            var temp = 0;
+
+            var elapsedTimeEvents = sortedEvents
+                .Where(h => int.TryParse(h.Data.GetValueOrDefault("elapsedTime"), out temp) && temp > 0 && h.Data.GetValueOrDefault("cached") != "1")
+                .Select(_ => temp)
+                .ToArray();
+
+            return elapsedTimeEvents.Any() ? (int)elapsedTimeEvents.Average() : 0;
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index f6140c2c5..66fe875dc 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -88,6 +88,8 @@
   "Author": "Author",
   "Automatic": "Automatic",
   "AutomaticSearch": "Automatic Search",
+  "AverageGrabs": "Average Grabs",
+  "AverageQueries": "Average Queries",
   "AverageResponseTimesMs": "Average Indexer Response Times (ms)",
   "Backup": "Backup",
   "BackupFolderHelpText": "Relative paths will be under {appName}'s AppData directory",