diff a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp
--- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp
+++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp
@@ -112,14 +112,7 @@
     return discard_entry(entry, _g1h);
   }
 };
 
 void G1SATBMarkQueueSet::filter(SATBMarkQueue& queue) {
-  G1CollectedHeap* g1h = G1CollectedHeap::heap();
-  if (g1h->collector_state()->is_in_marking()) {
-    apply_filter(G1SATBMarkQueueFilterFn(), queue);
-  } else {
-    // is_in_marking() covers both the concurrent marking and the Remark pause. Outside
-    // of that, there can be no entry that requires SATB marking.
-    queue.set_empty();
-  }
+  apply_filter(G1SATBMarkQueueFilterFn(), queue);
 }