diff --git a/src/refit/communication/REFITNetworkEndpointWorker.java b/src/refit/communication/REFITNetworkEndpointWorker.java
index 787e84809412f4094d250b6b180b4bbeebd085ff..e69475c5d7270bbb994dd7b1d7ed3af23f7a8523 100644
--- a/src/refit/communication/REFITNetworkEndpointWorker.java
+++ b/src/refit/communication/REFITNetworkEndpointWorker.java
@@ -60,7 +60,9 @@ public class REFITNetworkEndpointWorker extends REFITSchedulerTask {
 		if (address.nodeID != nodeID) {
 			throw new IllegalArgumentException("Got connection for wrong node!");
 		}
-		timer = newTimer(this::timeout);
+		if (REFITConfig.FAKE_WAN_DELAYS) {
+			timer = newTimer(this::timeout);
+		}
 		this.address = address;
 		try {
 			connection.init(socketChannel);