diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java
index 1c7e2044e6..5489cb56a0 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java
@@ -91,12 +91,16 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback,
 
 	@Override
 	public void afterEach(ExtensionContext context) throws Exception {
-		if (this.afterAllCalled.get()) {
+		if (extensionOverStaticField()) {
 			return;
 		}
 		after();
 	}
 
+	private boolean extensionOverStaticField() {
+		return this.afterAllCalled.get() || this.beforeAllCalled.get();
+	}
+
 	@Override
 	public void beforeAll(ExtensionContext extensionContext) {
 		try {
@@ -108,7 +112,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback,
 
 	@Override
 	public void beforeEach(ExtensionContext context) throws Exception {
-		if (this.beforeAllCalled.get()) {
+		if (extensionOverStaticField()) {
 			return;
 		}
 		before();