diff --git a/eslint-plugin/src/svelte-check-props.ts b/eslint-plugin/src/svelte-check-props.ts
index ef59cbd300..28d4a8cbe3 100644
--- a/eslint-plugin/src/svelte-check-props.ts
+++ b/eslint-plugin/src/svelte-check-props.ts
@@ -142,33 +142,6 @@ const reportInvalidPropType = (
 	});
 };
 
-const isDispatchCall = (node: TSESTree.Node | null, eventName: string) =>
-	node &&
-	node.type === TSESTree.AST_NODE_TYPES.CallExpression &&
-	node.callee.type === TSESTree.AST_NODE_TYPES.Identifier &&
-	node.callee.name === 'dispatch' &&
-	node.arguments[0]?.type === TSESTree.AST_NODE_TYPES.Literal &&
-	node.arguments[0].value === eventName;
-
-const isDispatchCallStatement = (eventName: string) => (node: TSESTree.Node) =>
-	(node.type === TSESTree.AST_NODE_TYPES.ExpressionStatement && isDispatchCall(node.expression, eventName)) ||
-	(node.type === TSESTree.AST_NODE_TYPES.VariableDeclaration && node.declarations.find((declaration) => isDispatchCall(declaration.init, eventName)));
-
-const findCallToDispatch = (functionNode: TSESTree.Node, eventName: string) => {
-	const body =
-		functionNode.type === TSESTree.AST_NODE_TYPES.ArrowFunctionExpression || functionNode.type === TSESTree.AST_NODE_TYPES.FunctionExpression
-			? functionNode.body
-			: undefined;
-	if (body) {
-		if (body.type === TSESTree.AST_NODE_TYPES.BlockStatement) {
-			return body.body.find(isDispatchCallStatement(eventName));
-		} else if (isDispatchCall(body, eventName)) {
-			return body;
-		}
-	}
-	return undefined;
-};
-
 const isBindingAssignment = (node: TSESTree.Node, propName: string) =>
 	node.type === TSESTree.AST_NODE_TYPES.AssignmentExpression &&
 	node.operator === '=' &&
@@ -195,18 +168,14 @@ const findBindingAssignment = (functionNode: TSESTree.Node, propName: string) =>
 
 const fixApiPatchEventHandler = (
 	fixer: TSESLint.RuleFixer,
-	name: string,
 	prop: EventInfo,
 	widgetStatementNode: TSESTree.Node,
 	widgetPatchArgNode: TSESTree.ObjectExpression | undefined,
 	eventInApiPatch: TSESTree.Node | undefined,
-	callToDispatch: TSESTree.Node | undefined,
 	bindingAssignment: TSESTree.Node | undefined,
 	context: Readonly<TSESLint.RuleContext<any, any>>,
 ) => {
-	const arrowFunction = prop.propBinding
-		? `(event) => {\n\t${prop.propBinding} = event;\n\tdispatch(${JSON.stringify(name)}, event);\n}`
-		: `(event) => dispatch(${JSON.stringify(name)}, event)`;
+	const arrowFunction = `(event) => {\n\t${prop.propBinding} = event;\n}`;
 	if (eventInApiPatch) {
 		if (
 			(eventInApiPatch.type === TSESTree.AST_NODE_TYPES.ArrowFunctionExpression ||
@@ -218,9 +187,6 @@ const fixApiPatchEventHandler = (
 			if (prop.propBinding && !bindingAssignment) {
 				content += `\n${prop.propBinding} = ${eventInApiPatch.params[0].name};`;
 			}
-			if (!callToDispatch) {
-				content += `\ndispatch(${JSON.stringify(name)}, ${eventInApiPatch.params[0].name});`;
-			}
 			const indentation = getChildIndentation(eventInApiPatch.body.body[0], eventInApiPatch.body, context);
 			return insertNewLineBefore(fixer, context.getSourceCode().getLastToken(eventInApiPatch.body)!, addIndentation(content, indentation), context);
 		}
@@ -243,30 +209,19 @@ const reportApiPatchEventHandlerIssue = (
 	widgetStatementNode: TSESTree.Node,
 	widgetPatchArgNode: TSESTree.ObjectExpression | undefined,
 	eventInWidgetPatch: TSESTree.Node | undefined,
-	callToDispatch: TSESTree.Node | undefined,
 	bindingAssignment: TSESTree.Node | undefined,
-	context: Readonly<TSESLint.RuleContext<'missingDispatchCall' | 'missingBindingAssignment', any>>,
+	context: Readonly<TSESLint.RuleContext<'missingBindingAssignment', any>>,
 ) => {
 	context.report({
 		node: eventInWidgetPatch || widgetPatchArgNode || widgetStatementNode,
-		messageId: !callToDispatch ? 'missingDispatchCall' : 'missingBindingAssignment',
+		messageId: 'missingBindingAssignment',
 		data: {
 			name,
 			widgetProp: prop.widgetProp,
 			propBinding: prop.propBinding,
 		},
 		fix(fixer) {
-			return fixApiPatchEventHandler(
-				fixer,
-				name,
-				prop,
-				widgetStatementNode,
-				widgetPatchArgNode,
-				eventInWidgetPatch,
-				callToDispatch,
-				bindingAssignment,
-				context,
-			);
+			return fixApiPatchEventHandler(fixer, prop, widgetStatementNode, widgetPatchArgNode, eventInWidgetPatch, bindingAssignment, context);
 		},
 	});
 };
@@ -339,17 +294,15 @@ export const svelteCheckPropsRule = ESLintUtils.RuleCreator.withoutDocs({
 							const eventsObject = extractEventsObject(widgetNode.init);
 							for (const [eventName, eventInfo] of widgetInfo.events) {
 								const eventInApiPatch = eventsObject?.properties.get(eventInfo.widgetProp);
-								const callToDispatch = eventInApiPatch ? findCallToDispatch(eventInApiPatch, eventName) : undefined;
 								const bindingAssignment =
 									eventInApiPatch && eventInfo.propBinding ? findBindingAssignment(eventInApiPatch, eventInfo.propBinding) : undefined;
-								if (!callToDispatch || (!bindingAssignment && eventInfo.propBinding)) {
+								if (!bindingAssignment && eventInfo.propBinding) {
 									reportApiPatchEventHandlerIssue(
 										eventName,
 										eventInfo,
 										widgetStatementNode,
 										eventsObject?.node,
 										eventInApiPatch,
-										callToDispatch,
 										bindingAssignment,
 										context,
 									);
@@ -372,7 +325,6 @@ export const svelteCheckPropsRule = ESLintUtils.RuleCreator.withoutDocs({
 			invalidPropType: 'Invalid type for "export let {{ name }}" declaration: expected {{ expectedType }}, found {{ foundType }}.',
 			missingBoundProp: 'Missing "export let {{ name }}" declaration, as it is a bound property in the API.',
 			missingBoundPropInAPI: 'Missing property {{ name }} in the API.',
-			missingDispatchCall: 'Could not find call to dispatch("{{name}}") in {{ widgetProp }} listener in call to widget.patch.',
 			missingBindingAssignment: 'Could not find assignment to {{ propBinding }} in {{ widgetProp }} listener in call to widget.patch.',
 		},
 		type: 'problem',
diff --git a/eslint-plugin/test/svelte-check-props.spec.ts b/eslint-plugin/test/svelte-check-props.spec.ts
index a23f1170a6..eab36cf99f 100644
--- a/eslint-plugin/test/svelte-check-props.spec.ts
+++ b/eslint-plugin/test/svelte-check-props.spec.ts
@@ -10,7 +10,7 @@ RuleTester.afterAll = afterAll;
 
 describe('svelte-check-props', () => {
 	const codeTemplate = (scriptContent: string, widgetProps: string, events = '{}') =>
-		`<script lang="ts" context="module">\nimport { createEventDispatcher } from "svelte";\ninterface MyWidgetProps {\n${widgetProps}\n}\ninterface MyWidget {\n\tpatch(props: Partial<MyWidgetProps>): void\n}\nconst callWidgetFactory: (config: any) => MyWidget;\n</script><script lang="ts">\nconst dispatch = createEventDispatcher();\n${scriptContent}\nlet widget = callWidgetFactory({events:${events}});\n</script>`;
+		`<script lang="ts" context="module">\ninterface MyWidgetProps {\n${widgetProps}\n}\ninterface MyWidget {\n\tpatch(props: Partial<MyWidgetProps>): void\n}\nconst callWidgetFactory: (config: any) => MyWidget;\n</script><script lang="ts">\n${scriptContent}\nlet widget = callWidgetFactory({events:${events}});\n</script>`;
 
 	const ruleTester = new RuleTester({
 		plugins: ['svelte'],
@@ -45,13 +45,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp1: string | undefined, someProp2: string | undefined;',
 				'someProp2: string; onSomeProp2Change: (event: string) => void;',
-				'{onSomeProp2Change: (event) => {dispatch("someProp2Change", event); someProp2 = event;}}',
+				'{onSomeProp2Change: (event) => {someProp2 = event;}}',
 			),
 			errors: [{messageId: 'extraProp', data: {name: 'someProp1'}}],
 			output: codeTemplate(
 				'export let  someProp2: string | undefined;',
 				'someProp2: string; onSomeProp2Change: (event: string) => void;',
-				'{onSomeProp2Change: (event) => {dispatch("someProp2Change", event); someProp2 = event;}}',
+				'{onSomeProp2Change: (event) => {someProp2 = event;}}',
 			),
 		},
 		{
@@ -59,7 +59,7 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp1: string | undefined, someProp2: string | undefined, someProp3: string | undefined;',
 				'someProp2: string; onSomeProp2Change: (event: string) => void;',
-				'{onSomeProp2Change: (event) => {dispatch("someProp2Change", event); someProp2 = event;}}',
+				'{onSomeProp2Change: (event) => {someProp2 = event;}}',
 			),
 			errors: [
 				{messageId: 'extraProp', data: {name: 'someProp1'}},
@@ -68,7 +68,7 @@ describe('svelte-check-props', () => {
 			output: codeTemplate(
 				'export let  someProp2: string | undefined;',
 				'someProp2: string; onSomeProp2Change: (event: string) => void;',
-				'{onSomeProp2Change: (event) => {dispatch("someProp2Change", event); someProp2 = event;}}',
+				'{onSomeProp2Change: (event) => {someProp2 = event;}}',
 			),
 		},
 		{
@@ -76,13 +76,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp1: string | undefined, someProp2: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}}',
 			),
 			errors: [{messageId: 'extraProp', data: {name: 'someProp2'}}],
 			output: codeTemplate(
 				'export let someProp1: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}}',
 			),
 		},
 		{
@@ -90,7 +90,7 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp1: string | undefined, someProp2: string | undefined, someProp3: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}}',
 			),
 			errors: [
 				{messageId: 'extraProp', data: {name: 'someProp2'}},
@@ -99,7 +99,7 @@ describe('svelte-check-props', () => {
 			output: codeTemplate(
 				'export let someProp1: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}}',
 			),
 		},
 		{
@@ -107,7 +107,7 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp1: string | undefined, someProp2: string | undefined, someProp3: string | undefined, someProp4: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}}',
 			),
 			errors: [
 				{messageId: 'extraProp', data: {name: 'someProp2'}},
@@ -117,7 +117,7 @@ describe('svelte-check-props', () => {
 			output: codeTemplate(
 				'export let someProp1: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}}',
 			),
 		},
 		{
@@ -125,7 +125,7 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp1: string | undefined, someProp2: string | undefined, someProp3: string | undefined, someProp4: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void; someProp3: string; onSomeProp3Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}, onSomeProp3Change: (event) => {dispatch("someProp3Change", event); someProp3 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}, onSomeProp3Change: (event) => {someProp3 = event;}}',
 			),
 			errors: [
 				{messageId: 'extraProp', data: {name: 'someProp2'}},
@@ -134,21 +134,17 @@ describe('svelte-check-props', () => {
 			output: codeTemplate(
 				'export let someProp1: string | undefined,  someProp3: string | undefined;',
 				'someProp1: string; onSomeProp1Change: (event: string) => void; someProp3: string; onSomeProp3Change: (event: string) => void;',
-				'{onSomeProp1Change: (event) => {dispatch("someProp1Change", event); someProp1 = event;}, onSomeProp3Change: (event) => {dispatch("someProp3Change", event); someProp3 = event;}}',
+				'{onSomeProp1Change: (event) => {someProp1 = event;}, onSomeProp3Change: (event) => {someProp3 = event;}}',
 			),
 		},
 		{
 			filename: 'file.svelte',
-			code: codeTemplate(
-				'',
-				'someProp: string; onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
-			),
+			code: codeTemplate('', 'someProp: string; onSomePropChange: (event: string) => void;', '{onSomePropChange: (event) => {someProp = event;}}'),
 			errors: [{messageId: 'missingBoundProp', data: {name: 'someProp'}}],
 			output: codeTemplate(
 				'\nexport let someProp: string | undefined = undefined;',
 				'someProp: string; onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 		},
 		{
@@ -156,7 +152,7 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'let someProp: string | undefined;',
 				'onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 			errors: [{messageId: 'missingBoundPropInAPI', data: {name: 'someProp'}}],
 		},
@@ -165,17 +161,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp: string | undefined;',
 				'onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 			errors: [
 				{messageId: 'extraProp', data: {name: 'someProp'}},
 				{messageId: 'missingBoundPropInAPI', data: {name: 'someProp'}},
 			],
-			output: codeTemplate(
-				'',
-				'onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
-			),
+			output: codeTemplate('', 'onSomePropChange: (event: string) => void;', '{onSomePropChange: (event) => {someProp = event;}}'),
 			outputError: true,
 		},
 		{
@@ -183,13 +175,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp: string;',
 				'someProp: string; onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 			errors: [{messageId: 'invalidPropType', data: {name: 'someProp', expectedType: 'string | undefined', foundType: 'string'}}],
 			output: codeTemplate(
 				'export let someProp: string | undefined;',
 				'someProp: string; onSomePropChange: (event: string) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 		},
 		{
@@ -197,13 +189,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp: string | undefined;',
 				'someProp: number; onSomePropChange: (event: number) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 			errors: [{messageId: 'invalidPropType', data: {name: 'someProp', expectedType: 'number | undefined', foundType: 'string | undefined'}}],
 			output: codeTemplate(
 				'export let someProp: number | undefined;',
 				'someProp: number; onSomePropChange: (event: number) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 		},
 		{
@@ -211,45 +203,23 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let someProp;',
 				'someProp: number; onSomePropChange: (event: number) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 			errors: [{messageId: 'invalidPropType', data: {name: 'someProp', expectedType: 'number | undefined', foundType: 'any'}}],
 			output: codeTemplate(
 				'export let someProp: number | undefined;',
 				'someProp: number; onSomePropChange: (event: number) => void;',
-				'{onSomePropChange: (event) => {dispatch("somePropChange", event); someProp = event;}}',
-			),
-		},
-		{
-			filename: 'file.svelte',
-			code: codeTemplate('', 'onSomething: (event: number) => void;'),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'something', widgetProp: 'onSomething'}}],
-			output: codeTemplate('', 'onSomething: (event: number) => void;', '{\n\tonSomething: (event) => dispatch("something", event),}'),
-		},
-		{
-			filename: 'file.svelte',
-			code: codeTemplate('', 'onSomething: (event: number) => void;', '{\n\tother: 5,\n}'),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'something', widgetProp: 'onSomething'}}],
-			output: codeTemplate('', 'onSomething: (event: number) => void;', '{\n\tonSomething: (event) => dispatch("something", event),\n\tother: 5,\n}'),
-		},
-		{
-			filename: 'file.svelte',
-			code: codeTemplate('', 'onSomething: (event: number) => void;', '{\n\tonSomething: (evt) => {\n\t\tsomethingElse(evt);\n\t},\n}'),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'something', widgetProp: 'onSomething'}}],
-			output: codeTemplate(
-				'',
-				'onSomething: (event: number) => void;',
-				'{\n\tonSomething: (evt) => {\n\t\tsomethingElse(evt);\n\t\n\t\tdispatch("something", evt);\n\t},\n}',
+				'{onSomePropChange: (event) => {someProp = event;}}',
 			),
 		},
 		{
 			filename: 'file.svelte',
 			code: codeTemplate('export let something: number | undefined;', 'onSomethingChange: (event: number) => void;\nsomething: number;'),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'somethingChange', widgetProp: 'onSomethingChange'}}],
+			errors: [{messageId: 'missingBindingAssignment', data: {propBinding: 'something', widgetProp: 'onSomethingChange'}}],
 			output: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t\tdispatch("somethingChange", event);\n\t},}',
+				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t},}',
 			),
 		},
 		{
@@ -259,11 +229,11 @@ describe('svelte-check-props', () => {
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
 				'{\n\tother: 5,\n}',
 			),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'somethingChange', widgetProp: 'onSomethingChange'}}],
+			errors: [{messageId: 'missingBindingAssignment', data: {propBinding: 'something', widgetProp: 'onSomethingChange'}}],
 			output: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t\tdispatch("somethingChange", event);\n\t},\n\tother: 5,\n}',
+				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t},\n\tother: 5,\n}',
 			),
 		},
 		{
@@ -273,11 +243,11 @@ describe('svelte-check-props', () => {
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
 				'{\n\tonSomethingChange: (evt) => {\n\t\tsomethingElse(evt);\n\t},\n}',
 			),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'somethingChange', widgetProp: 'onSomethingChange'}}],
+			errors: [{messageId: 'missingBindingAssignment', data: {propBinding: 'something', widgetProp: 'onSomethingChange'}}],
 			output: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (evt) => {\n\t\tsomethingElse(evt);\n\t\n\t\tsomething = evt;\n\t\tdispatch("somethingChange", evt);\n\t},\n}',
+				'{\n\tonSomethingChange: (evt) => {\n\t\tsomethingElse(evt);\n\t\n\t\tsomething = evt;\n\t},\n}',
 			),
 		},
 		{
@@ -285,13 +255,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (evt) => {\n\t\tdispatch("somethingChange", evt);\n\t},\n}',
+				'{\n\tonSomethingChange: (evt) => {\n\t\t\n\t},\n}',
 			),
 			errors: [{messageId: 'missingBindingAssignment', data: {propBinding: 'something', widgetProp: 'onSomethingChange'}}],
 			output: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (evt) => {\n\t\tdispatch("somethingChange", evt);\n\t\n\t\tsomething = evt;\n\t},\n}',
+				'{\n\tonSomethingChange: (evt) => {\n\t\t\n\t\n\t\tsomething = evt;\n\t},\n}',
 			),
 		},
 		{
@@ -299,13 +269,13 @@ describe('svelte-check-props', () => {
 			code: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (evt) => dispatch("somethingChange", evt),\n}',
+				'{\n\tonSomethingChange: (evt) => callSomething(),\n}',
 			),
 			errors: [{messageId: 'missingBindingAssignment', data: {propBinding: 'something', widgetProp: 'onSomethingChange'}}],
 			output: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t\tdispatch("somethingChange", event);\n\t},\n}',
+				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t},\n}',
 			),
 		},
 		{
@@ -315,25 +285,11 @@ describe('svelte-check-props', () => {
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
 				'{\n\tonSomethingChange: undefined,\n}',
 			),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'somethingChange', widgetProp: 'onSomethingChange'}}],
-			output: codeTemplate(
-				'export let something: number | undefined;',
-				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t\tdispatch("somethingChange", event);\n\t},\n}',
-			),
-		},
-		{
-			filename: 'file.svelte',
-			code: codeTemplate(
-				'export let something: number | undefined;',
-				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (event) => something = event,\n}',
-			),
-			errors: [{messageId: 'missingDispatchCall', data: {name: 'somethingChange', widgetProp: 'onSomethingChange'}}],
+			errors: [{messageId: 'missingBindingAssignment', data: {propBinding: 'something', widgetProp: 'onSomethingChange'}}],
 			output: codeTemplate(
 				'export let something: number | undefined;',
 				'onSomethingChange: (event: number) => void;\nsomething: number;',
-				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t\tdispatch("somethingChange", event);\n\t},\n}',
+				'{\n\tonSomethingChange: (event) => {\n\t\tsomething = event;\n\t},\n}',
 			),
 		},
 	];
@@ -350,6 +306,18 @@ describe('svelte-check-props', () => {
 			{
 				code: codeTemplate('', ''),
 			},
+			{
+				filename: 'file.svelte',
+				code: codeTemplate('', 'onSomething: (event: number) => void;'),
+			},
+			{
+				filename: 'file.svelte',
+				code: codeTemplate(
+					'export let something: number | undefined;',
+					'onSomethingChange: (event: number) => void;\nsomething: number;',
+					'{\n\tonSomethingChange: (event) => something = event,\n}',
+				),
+			},
 			...invalid
 				.filter(({output, outputError}) => !!output && !outputError)
 				.map(({output}) => ({
diff --git a/svelte/demo/samples/alert/Dynamic.route.svelte b/svelte/demo/samples/alert/Dynamic.route.svelte
index 4b6dbeb278..d5d391792d 100644
--- a/svelte/demo/samples/alert/Dynamic.route.svelte
+++ b/svelte/demo/samples/alert/Dynamic.route.svelte
@@ -35,5 +35,5 @@
 {#each $alerts$ as alert (alert)}
 	{@const {dismissible, animationOnInit, animation, type, slotDefault} = alert}
 
-	<Alert {dismissible} {animationOnInit} {animation} {type} {slotDefault} on:hidden={() => alerts$.remove(alert)} />
+	<Alert {dismissible} {animationOnInit} {animation} {type} {slotDefault} onHidden={() => alerts$.remove(alert)} />
 {/each}
diff --git a/svelte/demo/samples/rating/Default.route.svelte b/svelte/demo/samples/rating/Default.route.svelte
index 37cd6be3f9..6896e73680 100644
--- a/svelte/demo/samples/rating/Default.route.svelte
+++ b/svelte/demo/samples/rating/Default.route.svelte
@@ -6,7 +6,7 @@
 	let left = 0;
 </script>
 
-<Rating bind:rating on:hover={(e) => (hovered = e.detail)} on:leave={(e) => (left = e.detail)} ariaLabel="rating" />
+<Rating bind:rating onHover={(e) => (hovered = e)} onLeave={(e) => (left = e)} ariaLabel="rating" />
 <div>
 	Current rate: <span id="defaultRating">{rating}</span><br />
 	Hovered: <span id="defaultHovered">{hovered}</span><br />
diff --git a/svelte/headless/config.ts b/svelte/headless/config.ts
index 5c950df4ad..46e3e74fa2 100644
--- a/svelte/headless/config.ts
+++ b/svelte/headless/config.ts
@@ -74,7 +74,7 @@ export const widgetsConfigFactory = <Config extends {[widgetName: string]: objec
 		widgetName?: null | keyof Config;
 		$$slots: SlotsPresent<WidgetProps<W>>;
 		defaultConfig?: Partial<WidgetProps<W>> | ReadableSignal<Partial<WidgetProps<W>> | undefined>;
-		events: Pick<WidgetProps<W>, keyof WidgetProps<W> & `on${string}`>;
+		events: Pick<WidgetProps<W>, keyof WidgetProps<W> & `on${string}Change`>;
 	}) =>
 		callWidgetFactoryWithConfig({
 			factory,
diff --git a/svelte/headless/slotTypes.ts b/svelte/headless/slotTypes.ts
index 46680f76f3..4e4e95b54e 100644
--- a/svelte/headless/slotTypes.ts
+++ b/svelte/headless/slotTypes.ts
@@ -5,12 +5,6 @@ export const useSvelteSlot = Symbol('useSvelteSlot');
 
 export type WidgetPropsProps<Props extends object> = Partial<Props>;
 
-export type WidgetPropsEvents<Props extends object> = {
-	[K in keyof Props & `on${string}` as K extends `on${infer U}` ? Uncapitalize<U> : never]: NonNullable<Props[K]> extends (arg: infer U) => void
-		? CustomEvent<U>
-		: never;
-};
-
 export type WidgetPropsSlots<Props extends object> = {
 	[K in keyof Props & `slot${string}` as K extends `slot${infer U}` ? Uncapitalize<U> : never]: Props[K] extends SlotContent<infer U> ? U : never;
 };
diff --git a/svelte/headless/utils.ts b/svelte/headless/utils.ts
index 55724d34a4..0f66c75fdd 100644
--- a/svelte/headless/utils.ts
+++ b/svelte/headless/utils.ts
@@ -2,7 +2,6 @@ import type {Widget, WidgetFactory, WidgetProps} from '@agnos-ui/core';
 import {findChangedProperties, toReadableStore} from '@agnos-ui/core';
 import type {ReadableSignal, WritableSignal} from '@amadeus-it-group/tansu';
 import {asReadable, computed, writable} from '@amadeus-it-group/tansu';
-import {createEventDispatcher as svelteCreateEventDispatcher} from 'svelte';
 import type {SlotContent, SlotSvelteComponent, SlotsPresent} from './slotTypes';
 import {useSvelteSlot} from './slotTypes';
 
@@ -17,9 +16,6 @@ export function createPatchChangedProps<T extends object>(patchFn: (arg: Partial
 	};
 }
 
-export const createEventDispatcher = <T extends object>() =>
-	svelteCreateEventDispatcher<{[K in keyof T]: T[K] extends CustomEvent<infer U> ? U : never}>();
-
 /**
  * Merges two functions.
  * @param fn1 - first function
@@ -61,7 +57,7 @@ export const callWidgetFactoryWithConfig = <W extends Widget>({
 	$$slots: SlotsPresent<WidgetProps<W>>;
 	defaultConfig?: Partial<WidgetProps<W>> | ReadableSignal<Partial<WidgetProps<W>> | undefined>;
 	widgetConfig?: null | undefined | ReadableSignal<Partial<WidgetProps<W>> | undefined>;
-	events: Pick<WidgetProps<W>, keyof WidgetProps<W> & `on${string}`>;
+	events: Pick<WidgetProps<W>, keyof WidgetProps<W> & `on${string}Change`>;
 }): W & {patchChangedProps: W['patch']} => {
 	const defaultConfig$ = toReadableStore(defaultConfig);
 	const processedSlots: any = {};
@@ -71,7 +67,7 @@ export const callWidgetFactoryWithConfig = <W extends Widget>({
 		}
 	}
 	const props: {[key in keyof WidgetProps<W>]: WritableSignal<WidgetProps<W>[key]>} = {} as any;
-	for (const event of Object.keys(events) as (keyof WidgetProps<W> & `on${string}`)[]) {
+	for (const event of Object.keys(events) as (keyof WidgetProps<W> & `on${string}Change`)[]) {
 		props[event] = eventStore(events[event] as any) as any;
 	}
 	const widget = factory({
diff --git a/svelte/lib/accordion/Accordion.svelte b/svelte/lib/accordion/Accordion.svelte
index 8c84611599..be03fb95ab 100644
--- a/svelte/lib/accordion/Accordion.svelte
+++ b/svelte/lib/accordion/Accordion.svelte
@@ -1,15 +1,13 @@
 <script context="module" lang="ts">
-	import type {AccordionProps as Props, AccordionSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {callWidgetFactory, createAccordion, createEventDispatcher} from '@agnos-ui/svelte-headless';
+	import type {AccordionProps as Props, AccordionSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {callWidgetFactory, createAccordion} from '@agnos-ui/svelte-headless';
 	import {setAccordionApi} from './accordion';
 </script>
 
 <script lang="ts">
 	type $$Props = WidgetPropsProps<Props>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props>;
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Slots = {default: Record<string, never>} & Slots; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 
 	export let itemVisible: boolean | undefined = undefined;
 	const widget = callWidgetFactory({
@@ -19,15 +17,6 @@
 		events: {
 			onItemVisibleChange: (event) => {
 				itemVisible = event;
-				dispatch('itemVisibleChange', event);
-			},
-			onItemHidden: () => dispatch('itemHidden'),
-			onItemShown: () => dispatch('itemShown'),
-			onShown: (id: string) => {
-				dispatch('shown', id);
-			},
-			onHidden: (id: string) => {
-				dispatch('hidden', id);
 			},
 		},
 	});
diff --git a/svelte/lib/accordion/Item.svelte b/svelte/lib/accordion/Item.svelte
index 23fbd989a8..5b502935cb 100644
--- a/svelte/lib/accordion/Item.svelte
+++ b/svelte/lib/accordion/Item.svelte
@@ -1,6 +1,6 @@
 <script context="module" lang="ts">
-	import type {AccordionItemProps as Props, AccordionSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {Slot, callWidgetFactory, createEventDispatcher, toSlotContextWidget} from '@agnos-ui/svelte-headless';
+	import type {AccordionItemProps as Props, AccordionSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {Slot, callWidgetFactory, toSlotContextWidget} from '@agnos-ui/svelte-headless';
 	import {onMount} from 'svelte';
 	import ItemDefaultStructure from './ItemDefaultStructure.svelte';
 	import {getAccordionApi} from './accordion';
@@ -13,10 +13,8 @@
 <script lang="ts">
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Props = WidgetPropsProps<Props>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props>;
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Slots = Slots; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 
 	const accordionApi = getAccordionApi();
 	const {registerItem} = accordionApi;
@@ -28,10 +26,7 @@
 		events: {
 			onItemVisibleChange: (event) => {
 				itemVisible = event;
-				dispatch('itemVisibleChange', event);
 			},
-			onItemHidden: () => dispatch('itemHidden'),
-			onItemShown: () => dispatch('itemShown'),
 		},
 	});
 	const {
diff --git a/svelte/lib/alert/Alert.svelte b/svelte/lib/alert/Alert.svelte
index aaf747e33c..4bde62aad0 100644
--- a/svelte/lib/alert/Alert.svelte
+++ b/svelte/lib/alert/Alert.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
-	import type {AlertProps as Props, AlertSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {Slot, callWidgetFactory, createAlert, createEventDispatcher} from '@agnos-ui/svelte-headless';
+	import type {AlertProps as Props, AlertSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {Slot, callWidgetFactory, createAlert} from '@agnos-ui/svelte-headless';
 	import AlertDefaultStructure from './AlertDefaultStructure.svelte';
 
 	const defaultConfig: Partial<Props> = {
@@ -10,20 +10,15 @@
 
 <script lang="ts">
 	type $$Props = WidgetPropsProps<Props>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props>;
 	type $$Slots = Slots; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 	const widget = callWidgetFactory({
 		factory: createAlert,
 		widgetName: 'alert',
 		$$slots,
 		defaultConfig,
 		events: {
-			onShown: () => dispatch('shown'),
-			onHidden: () => dispatch('hidden'),
 			onVisibleChange: (event) => {
 				visible = event;
-				dispatch('visibleChange', event);
 			},
 		},
 	});
diff --git a/svelte/lib/modal/Modal.svelte b/svelte/lib/modal/Modal.svelte
index f3200eed4b..f243fb8622 100644
--- a/svelte/lib/modal/Modal.svelte
+++ b/svelte/lib/modal/Modal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
-	import type {ModalWidget, ModalProps as Props, ModalSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {Slot, callWidgetFactory, createEventDispatcher, createModal, toSlotContextWidget} from '@agnos-ui/svelte-headless';
+	import type {ModalWidget, ModalProps as Props, ModalSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {Slot, callWidgetFactory, createModal, toSlotContextWidget} from '@agnos-ui/svelte-headless';
 	import ModalDefaultHeader from './ModalDefaultHeader.svelte';
 	import ModalDefaultStructure from './ModalDefaultStructure.svelte';
 
@@ -14,10 +14,8 @@
 	type Data = $$Generic; // eslint-disable-line no-undef
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Props = WidgetPropsProps<Props<Data>>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props<Data>>;
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Slots = Slots<Data>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 
 	export let visible: boolean | undefined = undefined;
 
@@ -27,19 +25,8 @@
 		$$slots,
 		defaultConfig,
 		events: {
-			onShown: () => dispatch('shown'),
-			onHidden: () => dispatch('hidden'),
-			onBeforeClose: (event) => {
-				const shouldContinue = dispatch('beforeClose', event, {
-					cancelable: true,
-				});
-				if (!shouldContinue) {
-					event.cancel = true;
-				}
-			},
 			onVisibleChange: (event) => {
 				visible = event;
-				dispatch('visibleChange', event);
 			},
 		},
 	});
diff --git a/svelte/lib/pagination/Pagination.svelte b/svelte/lib/pagination/Pagination.svelte
index 8525aeb4e0..e0565e387c 100644
--- a/svelte/lib/pagination/Pagination.svelte
+++ b/svelte/lib/pagination/Pagination.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
-	import type {PaginationProps as Props, PaginationSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {Slot, callWidgetFactory, createEventDispatcher, createPagination, toSlotContextWidget} from '@agnos-ui/svelte-headless';
+	import type {PaginationProps as Props, PaginationSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {Slot, callWidgetFactory, createPagination, toSlotContextWidget} from '@agnos-ui/svelte-headless';
 	import PaginationDefaultPages from './PaginationDefaultPages.svelte';
 
 	const defaultConfig: Partial<Props> = {
@@ -11,10 +11,8 @@
 <script lang="ts">
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Props = WidgetPropsProps<Props>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props>;
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Slots = Slots; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 
 	/**
 	 *  The current page.
@@ -31,7 +29,6 @@
 		events: {
 			onPageChange: (value: number) => {
 				page = value;
-				dispatch('pageChange', value);
 			},
 		},
 	});
diff --git a/svelte/lib/rating/Rating.svelte b/svelte/lib/rating/Rating.svelte
index acddc1a1a4..0231adfc5f 100644
--- a/svelte/lib/rating/Rating.svelte
+++ b/svelte/lib/rating/Rating.svelte
@@ -1,15 +1,13 @@
 <script lang="ts" context="module">
-	import type {RatingProps as Props, RatingSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {Slot, callWidgetFactory, createEventDispatcher, createRating} from '@agnos-ui/svelte-headless';
+	import type {RatingProps as Props, RatingSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {Slot, callWidgetFactory, createRating} from '@agnos-ui/svelte-headless';
 </script>
 
 <script lang="ts">
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Props = WidgetPropsProps<Props>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props>;
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Slots = Slots; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 
 	export let rating: number | undefined = undefined;
 
@@ -18,11 +16,8 @@
 		widgetName: 'rating',
 		$$slots,
 		events: {
-			onHover: (value: number) => dispatch('hover', value),
-			onLeave: (value: number) => dispatch('leave', value),
 			onRatingChange: (value: number) => {
 				rating = value;
-				dispatch('ratingChange', value);
 			},
 		},
 	});
diff --git a/svelte/lib/select/Select.svelte b/svelte/lib/select/Select.svelte
index a8eb24403a..82b882a2a0 100644
--- a/svelte/lib/select/Select.svelte
+++ b/svelte/lib/select/Select.svelte
@@ -1,16 +1,14 @@
 <script lang="ts" context="module">
-	import type {SelectProps as Props, SelectWidget, SelectSlots as Slots, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {Slot, callWidgetFactory, createEventDispatcher, createSelect} from '@agnos-ui/svelte-headless';
+	import type {SelectProps as Props, SelectWidget, SelectSlots as Slots, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {Slot, callWidgetFactory, createSelect} from '@agnos-ui/svelte-headless';
 </script>
 
 <script lang="ts">
 	type Item = $$Generic; // eslint-disable-line no-undef
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Props = WidgetPropsProps<Props<Item>>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props<Item>>;
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Slots = Slots<Item>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	const dispatch = createEventDispatcher<$$Events>();
 
 	export let open: boolean | undefined = false;
 	export let filterText: string | undefined = undefined;
@@ -23,17 +21,12 @@
 		events: {
 			onOpenChange: function (isOpen: boolean): void {
 				open = isOpen;
-				dispatch('openChange', isOpen);
-
-				open = isOpen;
 			},
 			onSelectedChange: (newSelection) => {
 				selected = newSelection;
-				dispatch('selectedChange', newSelection);
 			},
 			onFilterTextChange: (value) => {
 				filterText = value;
-				dispatch('filterTextChange', value);
 			},
 		},
 	});
diff --git a/svelte/lib/slider/Slider.svelte b/svelte/lib/slider/Slider.svelte
index 0b844d8e5b..898873fd1d 100644
--- a/svelte/lib/slider/Slider.svelte
+++ b/svelte/lib/slider/Slider.svelte
@@ -1,13 +1,11 @@
 <script lang="ts" context="module">
-	import type {SliderProps as Props, WidgetPropsEvents, WidgetPropsProps} from '@agnos-ui/svelte-headless';
-	import {callWidgetFactory, createEventDispatcher, createSlider} from '@agnos-ui/svelte-headless';
+	import type {SliderProps as Props, WidgetPropsProps} from '@agnos-ui/svelte-headless';
+	import {callWidgetFactory, createSlider} from '@agnos-ui/svelte-headless';
 </script>
 
 <script lang="ts">
 	// cf https://github.com/ota-meshi/eslint-plugin-svelte/issues/348
 	type $$Props = WidgetPropsProps<Props>; // eslint-disable-line @typescript-eslint/no-unused-vars
-	type $$Events = WidgetPropsEvents<Props>;
-	const dispatch = createEventDispatcher<$$Events>();
 
 	export let values: number[] | undefined = undefined;
 
@@ -18,7 +16,6 @@
 		events: {
 			onValuesChange: function (newValues: number[]): void {
 				values = newValues;
-				dispatch('valuesChange', values);
 			},
 		},
 	});