diff --git a/lua/CopilotChat/init.lua b/lua/CopilotChat/init.lua
index dd9fb70c..1c25eda5 100644
--- a/lua/CopilotChat/init.lua
+++ b/lua/CopilotChat/init.lua
@@ -991,6 +991,14 @@ function M.ask(prompt, config)
       end
     end
 
+    if utils.empty(prompt) and utils.empty(resolved_tools) then
+      if not config.headless then
+        M.chat:remove_message('user')
+        finish()
+      end
+      return
+    end
+
     local ask_ok, ask_response = pcall(client.ask, client, prompt, {
       headless = config.headless,
       history = M.chat.messages,