diff --git a/app/components/agent/AgentInput.vue b/app/components/agent/AgentInput.vue
index 1ff53b4..957e026 100644
--- a/app/components/agent/AgentInput.vue
+++ b/app/components/agent/AgentInput.vue
@@ -29,9 +29,11 @@ const inputText = ref("");
 const textareaRef = ref<HTMLTextAreaElement | null>(null);
 const fetchedTools = ref<ToolInfo[]>([]);
 
+const hasAgentTools = computed(() => !!(props.agentTools && props.agentTools.length > 0));
+
 const availableTools = computed<ToolInfo[]>(() => {
-  if (props.agentTools && props.agentTools.length > 0) {
-    return props.agentTools;
+  if (hasAgentTools.value) {
+    return props.agentTools!;
   }
   return fetchedTools.value;
 });
@@ -45,7 +47,7 @@ const effectivePlaceholder = computed(() => {
 });
 
 async function loadTools() {
-  if (props.agentTools && props.agentTools.length > 0) return;
+  if (hasAgentTools.value) return;
   try {
     const res = await $fetch<{ code: number; data: ToolInfo[] }>("/api/llm/chat/tools");
     fetchedTools.value = res.data ?? [];
@@ -128,8 +130,8 @@ defineExpose({
       </button>
     </div>
 
-    <!-- Tools bar above input (hidden when model doesn't support tools) -->
-    <div v-if="!toolsDisabled" class="tools-bar">
+    <!-- Tools bar above input (hidden when model doesn't support tools or agent has no tools) -->
+    <div v-if="!toolsDisabled && hasAgentTools" class="tools-bar">
       <button
         class="toggle-btn"
         :class="{ active: enableTools, disabled: toolsDisabled }"
diff --git a/app/pages/chat/[agentSlug]/index.vue b/app/pages/chat/[agentSlug]/index.vue
index 8e260a1..bb4f3ec 100644
--- a/app/pages/chat/[agentSlug]/index.vue
+++ b/app/pages/chat/[agentSlug]/index.vue
@@ -86,10 +86,12 @@ const currentModelSupportsTools = computed(() => {
 const enableTools = computed({
   get: () => {
     if (!currentModelSupportsTools.value) return false;
+    if (agentTools.value.length === 0) return false;
     return !!(sessions.currentSession.value?.enableTools);
   },
   set: (val: boolean) => {
     if (!currentModelSupportsTools.value) return;
+    if (agentTools.value.length === 0) return;
     if (sessions.currentSessionId.value) {
       sessions.updateSessionConfig(sessions.currentSessionId.value, { enableTools: val });
     }
diff --git a/packages/drizzle-pkg/db.sqlite b/packages/drizzle-pkg/db.sqlite
index 9fdb0e1..30cd77a 100644
Binary files a/packages/drizzle-pkg/db.sqlite and b/packages/drizzle-pkg/db.sqlite differ