diff --git a/src/main/java/org/olat/modules/quality/analysis/ui/AnalysisController.java b/src/main/java/org/olat/modules/quality/analysis/ui/AnalysisController.java
index 503b978df5395b9207f930dd68ded703568e6092..e0b9d332ebeb2c8b3fbe63e77e646764ececcc67 100644
--- a/src/main/java/org/olat/modules/quality/analysis/ui/AnalysisController.java
+++ b/src/main/java/org/olat/modules/quality/analysis/ui/AnalysisController.java
@@ -304,10 +304,6 @@ public class AnalysisController extends BasicController implements TooledControl
 		reportHelper = null;
 		reportFigures = null;
 		
-		if (heatMapCtrl != null) {
-			heatMapCtrl.onFilter(ureq, searchParams);
-		}
-		
 		doOpenSegment(ureq, presentation.getAnalysisSegment());
 	}
 	
@@ -386,6 +382,8 @@ public class AnalysisController extends BasicController implements TooledControl
 			stackedDetailsPanel = new BreadcrumbedStackedPanel("forms", getTranslator(), heatMapCtrl);
 			stackedDetailsPanel.pushController(translate("analysis.details"), heatMapCtrl);
 			heatMapCtrl.setBreadcrumbPanel(stackedDetailsPanel);
+		} else {
+			heatMapCtrl.onFilter(ureq, presentation.getSearchParams());
 		}
 		mainVC.put(SEGMENTS_CMP, stackedDetailsPanel);
 		segmentButtonsCmp.setSelectedButton(heatMapLink);