diff --git a/web/frontend/src/joblist/Row.svelte b/web/frontend/src/joblist/Row.svelte
index 7540fc5..b4375bc 100644
--- a/web/frontend/src/joblist/Row.svelte
+++ b/web/frontend/src/joblist/Row.svelte
@@ -181,7 +181,7 @@
                         >Metric disabled for subcluster '{job.subCluster}'</Card
                     >
                 {:else}
-                    <Card body color="warning">Missing Data</Card>
+                    <Card body color="warning">Missing Full Dataset</Card>
                 {/if}
             </td>
         {/each}
diff --git a/web/frontend/src/plots/MetricPlot.svelte b/web/frontend/src/plots/MetricPlot.svelte
index db0a052..f559859 100644
--- a/web/frontend/src/plots/MetricPlot.svelte
+++ b/web/frontend/src/plots/MetricPlot.svelte
@@ -24,6 +24,7 @@
     import uPlot from 'uplot'
     import { formatNumber } from '../units.js'
     import { getContext, onMount, onDestroy } from 'svelte'
+    import { Card } from 'sveltestrap'
 
     export let width
     export let height
@@ -219,11 +220,15 @@
         }, resizeSleepTime)
     }
 
-    $: onSizeChange(width, height)
+    $: if (series[0].data.length > 0) {
+         onSizeChange(width, height)
+    }
 
     onMount(() => {
-        plotWrapper.style.backgroundColor = backgroundColor()
-        render()
+        if (series[0].data.length > 0) {
+            plotWrapper.style.backgroundColor = backgroundColor()
+            render()
+        }
     })
 
     onDestroy(() => {
@@ -312,9 +317,11 @@
 
 </script>
 
-<!--Add empty series warning card-->
-<div bind:this={plotWrapper} class="cc-plot"></div>
-
+{#if series[0].data.length > 0}
+    <div bind:this={plotWrapper} class="cc-plot"></div>
+{:else}
+    <Card style="margin-left: 2rem;margin-right: 2rem;" body color="warning">Cannot render plot: No series data found for <code>{metric}</code></Card>
+{/if}
 <style>
     .cc-plot {
         border-radius: 5px;
diff --git a/web/frontend/src/utils.js b/web/frontend/src/utils.js
index 67f2e1c..2112d21 100644
--- a/web/frontend/src/utils.js
+++ b/web/frontend/src/utils.js
@@ -183,9 +183,10 @@ export function groupByScope(jobMetrics) {
 const scopeGranularity = {
     node: 10,
     socket: 5,
-    accelerator: 5,
-    core: 2,
-    hwthread: 1,
+    memorydomain: 4,
+    core: 3,
+    hwthread: 2,
+    accelerator: 1
 };
 
 export function maxScope(scopes) {