diff --git a/lua/opencode/config.lua b/lua/opencode/config.lua
index ed06717d..9027fb0a 100644
--- a/lua/opencode/config.lua
+++ b/lua/opencode/config.lua
@@ -124,7 +124,6 @@ M.defaults = {
         show_output = true,
         show_reasoning_output = true,
       },
-      auto_scroll = false,
       always_scroll_to_bottom = false,
     },
     input = {
diff --git a/lua/opencode/ui/output_window.lua b/lua/opencode/ui/output_window.lua
index b1d42231..6da3ff8d 100644
--- a/lua/opencode/ui/output_window.lua
+++ b/lua/opencode/ui/output_window.lua
@@ -232,12 +232,4 @@ function M.clear()
   M.viewport_at_bottom = true
 end
 
-function M.should_auto_scroll()
-  if config.ui.output.always_scroll_to_bottom then
-    return true
-  end
-
-  return config.ui.output.auto_scroll ~= false
-end
-
 return M
diff --git a/lua/opencode/ui/renderer.lua b/lua/opencode/ui/renderer.lua
index a6242e95..827caab8 100644
--- a/lua/opencode/ui/renderer.lua
+++ b/lua/opencode/ui/renderer.lua
@@ -231,12 +231,7 @@ function M.scroll_to_bottom()
 
   trigger_on_data_rendered()
 
-  if not output_window.should_auto_scroll() then
-    return
-  end
-
   -- Determine if we should scroll to bottom
-
   local should_scroll = false
 
   -- Always scroll on initial render