diff --git a/System_Essentials/conf_sync.sh b/System_Essentials/conf_sync.sh
index bb6e9bc..afbecd8 100755
--- a/System_Essentials/conf_sync.sh
+++ b/System_Essentials/conf_sync.sh
@@ -49,6 +49,11 @@ done
 parse_args "${FILTERED_ARGS[@]}"
 detect_hosts
 
+if [[ "${CONF_SYNC_ENABLED:-true}" == false ]]; then
+    log "CONF_SYNC_ENABLED=false — skipping"
+    exit 0
+fi
+
 CACHE_DIR="/tmp/.vv/config/cached/.confs"
 MY_CONF="$SCRIPTS_ROOT/Configurations/${MY_ID,,}.conf"
 SSH_TIMEOUT=10
@@ -145,3 +150,9 @@ elif [[ "$PULL_ONLY" == true ]]; then
 else
     info "Conf sync complete — pulled $PULLED, pushed $PUSHED${FAILED:+, $FAILED failed}"
 fi
+
+if [[ "$FAILED" -gt 0 ]]; then
+    notify "Conf sync on $LOCAL_SERVER_NAME ($MY_ID) — $FAILED partner(s) failed. Partner config cache may be stale." \
+        "Conf Sync" "warning"
+    exit 1
+fi