diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
index 6f036475a1e1..cf2b1e59b2a2 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
@@ -21,7 +21,7 @@ export const createTimeRangeWithInterval = async (
 ): Promise<InfraTimerangeInput> => {
   const aggregations = getMetricsAggregations(options);
   const modules = await aggregationsToModules(framework, requestContext, aggregations, options);
-  const interval =
+  const interval = Math.max(
     (await calculateMetricInterval(
       framework,
       requestContext,
@@ -32,7 +32,9 @@ export const createTimeRangeWithInterval = async (
       },
       modules,
       options.nodeType
-    )) || 60000;
+    )) || 60,
+    60
+  );
   return {
     interval: `${interval}s`,
     from: options.timerange.to - interval * 5000, // We need at least 5 buckets worth of data
diff --git a/x-pack/test/api_integration/apis/infra/waffle.ts b/x-pack/test/api_integration/apis/infra/waffle.ts
index 1f79ad4eee4e..c5428db1090e 100644
--- a/x-pack/test/api_integration/apis/infra/waffle.ts
+++ b/x-pack/test/api_integration/apis/infra/waffle.ts
@@ -189,14 +189,52 @@ export default function({ getService }: FtrProviderContext) {
             expect(firstNode).to.have.property('metric');
             expect(firstNode.metric).to.eql({
               name: 'cpu',
-              value: 0.009285714285714286,
-              max: 0.009285714285714286,
-              avg: 0.0015476190476190477,
+              value: 0.0032,
+              max: 0.0038333333333333336,
+              avg: 0.0027944444444444444,
             });
           }
         });
       });
 
+      it('should work with custom metrics', async () => {
+        const data = await fetchSnapshot({
+          sourceId: 'default',
+          timerange: {
+            to: max,
+            from: min,
+            interval: '1m',
+          },
+          metric: {
+            type: 'custom',
+            field: 'system.cpu.user.pct',
+            aggregation: 'avg',
+            id: '1',
+          } as SnapshotMetricInput,
+          nodeType: 'host' as InfraNodeType,
+          groupBy: [],
+        });
+
+        const snapshot = data;
+        expect(snapshot).to.have.property('nodes');
+        if (snapshot) {
+          const { nodes } = snapshot;
+          expect(nodes.length).to.equal(1);
+          const firstNode = first(nodes);
+          expect(firstNode).to.have.property('path');
+          expect(firstNode.path.length).to.equal(1);
+          expect(first(firstNode.path)).to.have.property('value', 'demo-stack-mysql-01');
+          expect(first(firstNode.path)).to.have.property('label', 'demo-stack-mysql-01');
+          expect(firstNode).to.have.property('metric');
+          expect(firstNode.metric).to.eql({
+            name: 'custom',
+            value: 0.0016,
+            max: 0.0018333333333333333,
+            avg: 0.0013666666666666669,
+          });
+        }
+      });
+
       it('should basically work with 1 grouping', () => {
         const resp = fetchSnapshot({
           sourceId: 'default',
@@ -279,9 +317,9 @@ export default function({ getService }: FtrProviderContext) {
             expect(firstNode).to.have.property('metric');
             expect(firstNode.metric).to.eql({
               name: 'cpu',
-              value: 0.009285714285714286,
-              max: 0.009285714285714286,
-              avg: 0.0015476190476190477,
+              value: 0.0032,
+              max: 0.0038333333333333336,
+              avg: 0.0027944444444444444,
             });
             const secondNode = nodes[1];
             expect(secondNode).to.have.property('path');
@@ -291,9 +329,9 @@ export default function({ getService }: FtrProviderContext) {
             expect(secondNode).to.have.property('metric');
             expect(secondNode.metric).to.eql({
               name: 'cpu',
-              value: 0.009285714285714286,
-              max: 0.009285714285714286,
-              avg: 0.0015476190476190477,
+              value: 0.0032,
+              max: 0.0038333333333333336,
+              avg: 0.0027944444444444444,
             });
           }
         });