diff --git a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/roles/UserRolesSyncer.java b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/roles/UserRolesSyncer.java
index ee01c21e3..7526cf19f 100644
--- a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/roles/UserRolesSyncer.java
+++ b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/roles/UserRolesSyncer.java
@@ -84,6 +84,10 @@ public UserRolesSyncer(LockManager lockManager,
 
   @Scheduled(fixedDelay = 30000L)
   public void schedule() {
+    if (syncDelayMs < 0) {
+      return;
+    }
+
     LockManager.LockOptions lockOptions = new LockManager.LockOptions()
         .withLockName("Fiat.UserRolesSyncer".toLowerCase())
         .withMaximumLockDuration(Duration.ofMillis(syncDelayMs + syncDelayTimeoutMs))
diff --git a/fiat-web/src/test/resources/fiat.properties b/fiat-web/src/test/resources/fiat.properties
index 681ae1be8..bc034bdfc 100644
--- a/fiat-web/src/test/resources/fiat.properties
+++ b/fiat-web/src/test/resources/fiat.properties
@@ -2,3 +2,4 @@ services.front50.baseUrl=ignored
 services.clouddriver.baseUrl=ignored
 
 fiat.cache.expiresAfterWriteSeconds=0
+fiat.writeMode.syncDelayMs=-1
\ No newline at end of file