diff --git a/lua/opencode/core.lua b/lua/opencode/core.lua
index ee7f8618..d8d06630 100644
--- a/lua/opencode/core.lua
+++ b/lua/opencode/core.lua
@@ -518,10 +518,10 @@ M.ensure_current_mode = Promise.async(function()
 
     -- Try to use the configured default mode if it's available
     if default_mode and vim.tbl_contains(available_agents, default_mode) then
-      state.current_mode = default_mode
+      return M.switch_to_mode(default_mode):await()
     else
       -- Fallback to first available agent
-      state.current_mode = available_agents[1]
+      return M.switch_to_mode(available_agents[1]):await()
     end
   end
   return true