diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdeb50c0..69cf9cd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - biceps:R0034_0 does not track changes when reinserting descriptors.
 - report duplication issue in biceps:C11-C15, biceps:C5, biceps:R5046_0, biceps:B-284_0 as well as biceps:R5003.
 - biceps:5-4-7 tests confusing changes made by SetComponentActivation manipulations with changes made by SetMetricStatus.
+- glue:R0036_0 test can be blocked by long-running t2iapi RPCs.
 - biceps:5025_0 test case could not be satisfied by devices that do not support inserting and removing descriptors.
 
 ## [7.0.1] - 2023-03-17
diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/glue/direct/DirectSubscriptionHandlingTest.java b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/glue/direct/DirectSubscriptionHandlingTest.java
index d900aae9..3f76f318 100644
--- a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/glue/direct/DirectSubscriptionHandlingTest.java
+++ b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/glue/direct/DirectSubscriptionHandlingTest.java
@@ -418,8 +418,8 @@ private void triggerReportAndIntentionallyFailReceivingIt(final ReportTestData t
         LOG.info("Triggering a Report and intentionally causing a failure...");
         triggerableReport.setReportReceived(false);
         triggerableReport.setFailOnReceivingReport(true);
+        triggerableReport.trigger();
         synchronized (triggerableReport.getSyncPoint()) {
-            triggerableReport.trigger();
             final long timeout = System.nanoTime() + TIMEOUT_NANOS;
             while (!triggerableReport.getReportReceived() && System.nanoTime() < timeout) {
                 try {