diff --git a/ChatView/ChatRootView.cpp b/ChatView/ChatRootView.cpp
index 55268b2..3cfbfb7 100644
--- a/ChatView/ChatRootView.cpp
+++ b/ChatView/ChatRootView.cpp
@@ -49,7 +49,6 @@ ChatRootView::ChatRootView(QQuickItem *parent)
     , m_promptProvider(LLMCore::PromptTemplateManager::instance())
     , m_clientInterface(new ClientInterface(m_chatModel, &m_promptProvider, this))
     , m_isRequestInProgress(false)
-    , m_isAgentMode(false)
 {
     m_isSyncOpenFiles = Settings::chatAssistantSettings().linkOpenFiles();
     connect(
@@ -150,7 +149,7 @@ ChatRootView::ChatRootView(QQuickItem *parent)
         &ChatRootView::refreshRules);
 
     QSettings appSettings;
-    m_isAgentMode = appSettings.value("QodeAssist/Chat/AgentMode", true).toBool();
+    m_isAgentMode = appSettings.value("QodeAssist/Chat/AgentMode", false).toBool();
 
     connect(
         &Settings::generalSettings().useTools,
diff --git a/ChatView/qml/RootItem.qml b/ChatView/qml/RootItem.qml
index 95263a7..b273f53 100644
--- a/ChatView/qml/RootItem.qml
+++ b/ChatView/qml/RootItem.qml
@@ -87,7 +87,7 @@ ChatRootView {
             agentModeSwitch {
                 checked: root.isAgentMode
                 enabled: root.toolsSupportEnabled
-                onCheckedChanged: {
+                onToggled: {
                     root.isAgentMode = agentModeSwitch.checked
                 }
             }