diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java
index 318080aeb..c9a41c230 100644
--- a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java
+++ b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java
@@ -215,9 +215,12 @@ protected IXDataRenderer getChartRenderer(IItemCollection itemsInTable, Histogra
 			XYDataRenderer heapRenderer = new XYDataRenderer(UnitLookup.MEMORY.getDefaultUnit().quantity(0),
 					Messages.HeapPage_ROW_MEMORY_USAGE, Messages.HeapPage_ROW_MEMORY_USAGE_DESC);
 
+			Optional<IItemCollection> optionalHeapSummaryItems = getMemoryEvents(allItems, HEAP_SUMMARY, heapRenderer);
+			Optional<IItemCollection> optionalRssItems = getRssEvents(allItems, heapRenderer);
+			Optional<IItemCollection> optionalOsMemorySummaryItems = getMemoryEvents(allItems, OS_MEMORY_SUMMARY,
+					heapRenderer);
 			Supplier<Stream<IItemCollection>> memoryEventsSupplier = () -> Stream
-					.of(getMemoryEvents(allItems, HEAP_SUMMARY, heapRenderer), getRssEvents(allItems, heapRenderer),
-							getMemoryEvents(allItems, OS_MEMORY_SUMMARY, heapRenderer))
+					.of(optionalHeapSummaryItems, optionalRssItems, optionalOsMemorySummaryItems)
 					.filter(Optional::isPresent).map(Optional::get);
 
 			IItemCollection mergedEvents = ItemCollectionToolkit.merge(memoryEventsSupplier);