diff --git a/coin/provisioning/common/macos/disable_spotlight.sh b/coin/provisioning/common/macos/disable_spotlight.sh
index b4907ca0..82ca3d7f 100755
--- a/coin/provisioning/common/macos/disable_spotlight.sh
+++ b/coin/provisioning/common/macos/disable_spotlight.sh
@@ -12,6 +12,13 @@ disableSpotlight() {
     sudo mdutil -E /
 }
 
+fixUnknownIndexingState() {
+    echo "Fix unknown indexing state by enabling indexing back one by one"
+    sudo mdutil -i on / || return 1
+    sudo mdutil -i on /System/Volumes/Preboot || return 1
+    sudo mdutil -i on /System/Volumes/Data || return 1
+}
+
 # Disabling spotlight tends to be flaky, add some retry
 for i in $(seq 1 5)
 do
@@ -22,7 +29,8 @@ do
         echo "Spotlight disabled"
         break
     else
-        echo "Failed to disable spotlight, $i retry..."
+        echo "Failed to disable spotlight, $i run fix and retry..."
+        fixUnknownIndexingState
         sleep 2
     fi
 done