diff --git a/src/main/java/lu/jpt/csparqlproject/SimulationContext.java b/src/main/java/lu/jpt/csparqlproject/SimulationContext.java
index 363fc1a..868da3a 100644
--- a/src/main/java/lu/jpt/csparqlproject/SimulationContext.java
+++ b/src/main/java/lu/jpt/csparqlproject/SimulationContext.java
@@ -183,12 +183,16 @@ public class SimulationContext {
 					RDFStreamFormatter rdfStreamFormatter = new RDFStreamFormatter(streamUri);
 					engine.registerStream(rdfStreamFormatter);
 					resultProxy.addObserver(rdfStreamFormatter);
-					Observer resultObserver = this.createResultObserverWindow(queryContainer.name);
-					resultProxy.addObserver(resultObserver);
+					if(queryContainer.useObserverWindow) {
+						Observer resultObserver = this.createResultObserverWindow(queryContainer.name);
+						resultProxy.addObserver(resultObserver);
+					}
 				} else {
-					// If it is a regular query, just attach a fitting observer
-					Observer resultObserver = this.createResultObserverWindow(queryContainer.name);
-					resultProxy.addObserver(resultObserver);
+					// If it is a regular query, just attach a fitting observer, if enabled
+					if(queryContainer.useObserverWindow) {
+						Observer resultObserver = this.createResultObserverWindow(queryContainer.name);
+						resultProxy.addObserver(resultObserver);
+					}
 				}
 				// Attach custom observers to resultProxy if available
 				// These are used for SPARQL UPDATE queries on local domain knowledge