diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index 6bc9aa62be7..084df1cacaf 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -2094,9 +2094,13 @@ ${prompt}
 			sharingEnabled: sharingEnabled ?? false,
 			organizationAllowList,
 			// kilocode_change start
-			ghostServiceSettings: ghostServiceSettings ?? {
-				enableQuickInlineTaskKeybinding: true,
-				enableSmartInlineTaskKeybinding: true,
+			ghostServiceSettings: {
+				enableAutoTrigger: ghostServiceSettings?.enableAutoTrigger ?? true,
+				enableQuickInlineTaskKeybinding: ghostServiceSettings?.enableQuickInlineTaskKeybinding ?? true,
+				enableSmartInlineTaskKeybinding: ghostServiceSettings?.enableSmartInlineTaskKeybinding ?? true,
+				showGutterAnimation: ghostServiceSettings?.showGutterAnimation ?? false,
+				provider: ghostServiceSettings?.provider,
+				model: ghostServiceSettings?.model,
 			},
 			// kilocode_change end
 			organizationSettingsVersion,
@@ -2310,9 +2314,15 @@ ${prompt}
 			commitMessageApiConfigId: stateValues.commitMessageApiConfigId, // kilocode_change
 			terminalCommandApiConfigId: stateValues.terminalCommandApiConfigId, // kilocode_change
 			// kilocode_change start
-			ghostServiceSettings: stateValues.ghostServiceSettings ?? {
-				enableQuickInlineTaskKeybinding: true,
-				enableSmartInlineTaskKeybinding: true,
+			ghostServiceSettings: {
+				enableAutoTrigger: stateValues.ghostServiceSettings?.enableAutoTrigger ?? true,
+				enableQuickInlineTaskKeybinding:
+					stateValues.ghostServiceSettings?.enableQuickInlineTaskKeybinding ?? true,
+				enableSmartInlineTaskKeybinding:
+					stateValues.ghostServiceSettings?.enableSmartInlineTaskKeybinding ?? true,
+				showGutterAnimation: stateValues.ghostServiceSettings?.showGutterAnimation,
+				provider: stateValues.ghostServiceSettings?.provider,
+				model: stateValues.ghostServiceSettings?.model,
 			},
 			// kilocode_change end
 			experiments: stateValues.experiments ?? experimentDefault,
diff --git a/src/services/ghost/GhostGutterAnimation.ts b/src/services/ghost/GhostGutterAnimation.ts
index b7fba1cec4a..889ffdf0413 100644
--- a/src/services/ghost/GhostGutterAnimation.ts
+++ b/src/services/ghost/GhostGutterAnimation.ts
@@ -4,7 +4,7 @@ import type { GhostServiceSettings } from "@roo-code/types"
 export class GhostGutterAnimation {
 	private state: "hide" | "active" = "hide"
 	private decorationActive: vscode.TextEditorDecorationType
-	private isEnabled: boolean = true
+	private isEnabled: boolean = false
 
 	public constructor(context: vscode.ExtensionContext) {
 		this.decorationActive = vscode.window.createTextEditorDecorationType({
@@ -15,7 +15,7 @@ export class GhostGutterAnimation {
 	}
 
 	public updateSettings(settings: GhostServiceSettings | undefined) {
-		this.isEnabled = settings?.showGutterAnimation !== false
+		this.isEnabled = settings?.showGutterAnimation === true
 		if (!this.isEnabled) {
 			this.clearDecorations()
 		}
diff --git a/src/services/ghost/GhostServiceManager.ts b/src/services/ghost/GhostServiceManager.ts
index 0b86cd3a1dd..fca2a5f6b0d 100644
--- a/src/services/ghost/GhostServiceManager.ts
+++ b/src/services/ghost/GhostServiceManager.ts
@@ -121,7 +121,7 @@ export class GhostServiceManager {
 			enableAutoTrigger: false,
 			enableSmartInlineTaskKeybinding: false,
 			enableQuickInlineTaskKeybinding: false,
-			showGutterAnimation: true,
+			showGutterAnimation: false,
 		}
 		await this.saveSettings()
 		await this.load()
@@ -133,7 +133,7 @@ export class GhostServiceManager {
 			enableAutoTrigger: true,
 			enableSmartInlineTaskKeybinding: true,
 			enableQuickInlineTaskKeybinding: true,
-			showGutterAnimation: true,
+			showGutterAnimation: false,
 		}
 		await this.saveSettings()
 		await this.load()
diff --git a/webview-ui/src/components/settings/DisplaySettings.tsx b/webview-ui/src/components/settings/DisplaySettings.tsx
index a2ba5ac49ea..5a306bb9846 100644
--- a/webview-ui/src/components/settings/DisplaySettings.tsx
+++ b/webview-ui/src/components/settings/DisplaySettings.tsx
@@ -136,7 +136,7 @@ export const DisplaySettings = ({
 				<div className="mt-6 pt-6 border-t border-vscode-panel-border">
 					<div className="flex flex-col gap-1">
 						<VSCodeCheckbox
-							checked={ghostServiceSettings?.showGutterAnimation !== false}
+							checked={ghostServiceSettings?.showGutterAnimation === true}
 							onChange={(e) => {
 								onShowGutterAnimationChange((e as any).target?.checked || false)
 							}}>