diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
index d2cf3f7229..86229cc907 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
@@ -119,6 +119,9 @@ public class WireMockConfiguration implements SmartLifecycle {
 		if (!this.beanFactory.containsBean(WIREMOCK_SERVER_BEAN_NAME)) {
 			this.beanFactory.registerSingleton(WIREMOCK_SERVER_BEAN_NAME, this.server);
 		}
+		if (isRunning()) {
+			updateCurrentServer();
+		}
 	}
 
 	private void logRegisteredMappings() {
@@ -130,6 +133,7 @@ public class WireMockConfiguration implements SmartLifecycle {
 
 	void resetMappings() {
 		this.server.resetAll();
+		WireMock.reset();
 		logRegisteredMappings();
 	}