diff --git a/migrations/1767306902.sh b/migrations/1767306902.sh
index 9a0a1bb1..9bd36a60 100644
--- a/migrations/1767306902.sh
+++ b/migrations/1767306902.sh
@@ -45,10 +45,12 @@ fi
 THEMES_DIR="$HOME/.config/omarchy/themes"
 CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
 
-# Get current theme name from symlink before removing anything
+# Get current theme name before removing anything
 CURRENT_THEME_NAME=""
 if [[ -L $CURRENT_THEME_LINK ]]; then
   CURRENT_THEME_NAME=$(basename "$(readlink "$CURRENT_THEME_LINK")")
+elif [[ -d $CURRENT_THEME_LINK ]]; then
+  CURRENT_THEME_NAME=$(basename "$CURRENT_THEME_LINK")
 elif [[ -f "$HOME/.config/omarchy/current/theme.name" ]]; then
   CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
 fi
@@ -59,4 +61,7 @@ find "$THEMES_DIR" -mindepth 1 -maxdepth 1 -type l -delete
 # Re-apply the current theme with the new system
 if [[ -n $CURRENT_THEME_NAME ]]; then
   omarchy-theme-set "$CURRENT_THEME_NAME"
+else
+  # Backup to ensure a theme is set if we can't deduce the name
+  omarchy-theme-set "Tokyo Night"
 fi