diff --git a/agent/turn.go b/agent/turn.go
index 9a0bed7..280a190 100644
--- a/agent/turn.go
+++ b/agent/turn.go
@@ -125,8 +125,12 @@ func (ag *Agent) executeTurn(ctx context.Context, input string) string {
 	// Refresh tool definitions from the tool server so dynamically loaded
 	// tools (via tool_load) are available on the next turn without a rebuild.
 	var tools []backend.Tool
-	if ti, err := ag.runtime.ToolServer.ListTools(); err == nil {
-		tools = toolInfosToBackend(ti)
+	if ag.runtime.ToolServer != nil {
+		if ti, err := ag.runtime.ToolServer.ListTools(); err == nil {
+			tools = toolInfosToBackend(ti)
+		} else {
+			tools = ag.runtime.Tools
+		}
 	} else {
 		tools = ag.runtime.Tools
 	}