diff --git a/src/main/java/de/rub/nds/scanner/core/execution/Scanner.java b/src/main/java/de/rub/nds/scanner/core/execution/Scanner.java
index 446140b1..4ff80ff0 100644
--- a/src/main/java/de/rub/nds/scanner/core/execution/Scanner.java
+++ b/src/main/java/de/rub/nds/scanner/core/execution/Scanner.java
@@ -13,7 +13,9 @@
 import de.rub.nds.scanner.core.guideline.Guideline;
 import de.rub.nds.scanner.core.guideline.GuidelineChecker;
 import de.rub.nds.scanner.core.passive.StatsWriter;
+import de.rub.nds.scanner.core.probe.AnalyzedProperty;
 import de.rub.nds.scanner.core.probe.ScannerProbe;
+import de.rub.nds.scanner.core.probe.result.TestResults;
 import de.rub.nds.scanner.core.report.ScanReport;
 import de.rub.nds.scanner.core.report.rating.ScoreReport;
 import de.rub.nds.scanner.core.report.rating.SiteReportRater;
@@ -202,6 +204,13 @@ public ReportT scan() {
             return report;
         }
 
+        // prefill report with NOT_TESTED_YET for all scheduled probes
+        for (ProbeT probe : probeList) {
+            for (AnalyzedProperty property : probe.getAnalyzedProperties()) {
+                report.putResult(property, TestResults.NOT_TESTED_YET);
+            }
+        }
+
         // Scan Execution
         LOGGER.debug("Starting scan execution");
         ScanJob<ReportT, ProbeT, AfterProbeT, StateT> scanJob = new ScanJob<>(probeList, afterList);
diff --git a/src/main/java/de/rub/nds/scanner/core/probe/ScannerProbe.java b/src/main/java/de/rub/nds/scanner/core/probe/ScannerProbe.java
index 0369c0a0..cbb83951 100644
--- a/src/main/java/de/rub/nds/scanner/core/probe/ScannerProbe.java
+++ b/src/main/java/de/rub/nds/scanner/core/probe/ScannerProbe.java
@@ -71,6 +71,10 @@ protected final void register(AnalyzedProperty... properties) {
         }
     }
 
+    public Set<AnalyzedProperty> getAnalyzedProperties() {
+        return propertiesMap.keySet();
+    }
+
     public final <T> void putIfFalse(
             AnalyzedProperty determiningProperty,
             AnalyzedProperty propertyToSet,
diff --git a/src/main/java/de/rub/nds/scanner/core/probe/result/TestResults.java b/src/main/java/de/rub/nds/scanner/core/probe/result/TestResults.java
index 5057fbbe..ae1a9b97 100644
--- a/src/main/java/de/rub/nds/scanner/core/probe/result/TestResults.java
+++ b/src/main/java/de/rub/nds/scanner/core/probe/result/TestResults.java
@@ -24,7 +24,8 @@ public enum TestResults implements SummarizableTestResult {
     COULD_NOT_TEST,
     ERROR_DURING_TEST,
     UNCERTAIN,
-    UNSUPPORTED,
+    NOT_IMPLEMENTED,
+    NOT_SCHEDULED,
     NOT_TESTED_YET,
     UNASSIGNED_ERROR,
     TIMEOUT;
diff --git a/src/main/java/de/rub/nds/scanner/core/report/ScanReport.java b/src/main/java/de/rub/nds/scanner/core/report/ScanReport.java
index 7057f18a..fab5453c 100644
--- a/src/main/java/de/rub/nds/scanner/core/report/ScanReport.java
+++ b/src/main/java/de/rub/nds/scanner/core/report/ScanReport.java
@@ -108,10 +108,10 @@ public synchronized Map<AnalyzedProperty, TestResult> getResultMap() {
      * Returns the test result for a specific property.
      *
      * @param property the property to get the result for
-     * @return the test result, or NOT_TESTED_YET if not found
+     * @return the test result, or NOT_SCHEDULED if not found
      */
     public synchronized TestResult getResult(AnalyzedProperty property) {
-        return resultMap.getOrDefault(property, TestResults.NOT_TESTED_YET);
+        return resultMap.getOrDefault(property, TestResults.NOT_SCHEDULED);
     }
 
     /**