diff --git a/projects/js-packages/ai-client/changelog/add-ai-cancel-button b/projects/js-packages/ai-client/changelog/add-ai-cancel-button
new file mode 100644
index 0000000000000..3977d5f152b6f
--- /dev/null
+++ b/projects/js-packages/ai-client/changelog/add-ai-cancel-button
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+AI Client: add cancel button to get rid of the assistant block
diff --git a/projects/js-packages/ai-client/src/components/ai-control/index.tsx b/projects/js-packages/ai-client/src/components/ai-control/index.tsx
index bf44c7996ddd1..369a379a4e990 100644
--- a/projects/js-packages/ai-client/src/components/ai-control/index.tsx
+++ b/projects/js-packages/ai-client/src/components/ai-control/index.tsx
@@ -77,7 +77,7 @@ export function AIControl(
 		onSend = noop,
 		onStop = noop,
 		onAccept = noop,
-		onDiscard = noop,
+		onDiscard = null,
 	}: AiControlProps,
 	ref: React.MutableRefObject< null > // eslint-disable-line @typescript-eslint/ban-types
 ): React.ReactElement {
@@ -162,7 +162,7 @@ export function AIControl(
 						/>
 					</div>
 
-					{ ( ! showAccept || editRequest ) && value?.length > 0 && (
+					{ ( ! showAccept || editRequest ) && (
 						<div className="jetpack-components-ai-control__controls-prompt_button_wrapper">
 							{ ! loading ? (
 								<>
@@ -181,19 +181,36 @@ export function AIControl(
 										</Button>
 									) }
 
-									<Button
-										className="jetpack-components-ai-control__controls-prompt_button"
-										onClick={ sendRequest }
-										variant="primary"
-										disabled={ ! value?.length || disabled }
-										label={ __( 'Send request', 'jetpack-ai-client' ) }
-									>
-										{ showButtonLabels ? (
-											__( 'Generate', 'jetpack-ai-client' )
-										) : (
-											<Icon icon={ arrowUp } />
-										) }
-									</Button>
+									{ ! editRequest && ! value?.length && onDiscard && (
+										<Button
+											className="jetpack-components-ai-control__controls-prompt_button"
+											onClick={ discardHandler }
+											variant="secondary"
+											label={ __( 'Cancel', 'jetpack-ai-client' ) }
+										>
+											{ showButtonLabels ? (
+												__( 'Cancel', 'jetpack-ai-client' )
+											) : (
+												<Icon icon={ closeSmall } />
+											) }
+										</Button>
+									) }
+
+									{ value?.length > 0 && (
+										<Button
+											className="jetpack-components-ai-control__controls-prompt_button"
+											onClick={ sendRequest }
+											variant="primary"
+											disabled={ ! value?.length || disabled }
+											label={ __( 'Send request', 'jetpack-ai-client' ) }
+										>
+											{ showButtonLabels ? (
+												__( 'Generate', 'jetpack-ai-client' )
+											) : (
+												<Icon icon={ arrowUp } />
+											) }
+										</Button>
+									) }
 								</>
 							) : (
 								<Button