diff --git a/src/validate/html/validateEventHandler.ts b/src/validate/html/validateEventHandler.ts
index 2339f801d9..8e8a6122b3 100644
--- a/src/validate/html/validateEventHandler.ts
+++ b/src/validate/html/validateEventHandler.ts
@@ -1,6 +1,6 @@
 import flattenReference from '../../utils/flattenReference';
 import list from '../../utils/list';
-import { Validator } from '../index';
+import validate, { Validator } from '../index';
 import validCalleeObjects from '../../utils/validCalleeObjects';
 import { Node } from '../../interfaces';
 
@@ -28,6 +28,13 @@ export default function validateEventHandlerCallee(
 		return;
 	}
 
+	if (name === 'store' && attribute.expression.callee.type === 'MemberExpression') {
+		if (!validator.options.store) {
+			validator.warn('compile with `store: true` in order to call store methods', attribute.expression.start);
+		}
+		return;
+	}
+
 	if (
 		(callee.type === 'Identifier' && validBuiltins.has(callee.name)) ||
 		validator.methods.has(callee.name)
@@ -35,6 +42,7 @@ export default function validateEventHandlerCallee(
 		return;
 
 	const validCallees = ['this.*', 'event.*', 'options.*', 'console.*'].concat(
+		validator.options.store ? 'store.*' : [],
 		Array.from(validBuiltins),
 		Array.from(validator.methods.keys())
 	);
diff --git a/src/validate/index.ts b/src/validate/index.ts
index 17c3e83be9..5ed4d58bd9 100644
--- a/src/validate/index.ts
+++ b/src/validate/index.ts
@@ -22,6 +22,7 @@ export class Validator {
 	readonly source: string;
 	readonly filename: string;
 
+	options: CompileOptions;
 	onwarn: ({}) => void;
 	locator?: (pos: number) => Location;
 
@@ -37,8 +38,8 @@ export class Validator {
 	constructor(parsed: Parsed, source: string, options: CompileOptions) {
 		this.source = source;
 		this.filename = options.filename;
-
 		this.onwarn = options.onwarn;
+		this.options = options;
 
 		this.namespace = null;
 		this.defaultExport = null;
@@ -78,7 +79,7 @@ export default function validate(
 	stylesheet: Stylesheet,
 	options: CompileOptions
 ) {
-	const { onwarn, onerror, name, filename } = options;
+	const { onwarn, onerror, name, filename, store } = options;
 
 	try {
 		if (name && !/^[a-zA-Z_$][a-zA-Z_$0-9]*$/.test(name)) {
@@ -99,6 +100,7 @@ export default function validate(
 			onwarn,
 			name,
 			filename,
+			store
 		});
 
 		if (parsed.js) {
diff --git a/test/runtime/samples/store-event/NameInput.html b/test/runtime/samples/store-event/NameInput.html
new file mode 100644
index 0000000000..ecd95d0364
--- /dev/null
+++ b/test/runtime/samples/store-event/NameInput.html
@@ -0,0 +1 @@
+<input on:input='store.setName(this.value)'>
\ No newline at end of file
diff --git a/test/runtime/samples/store-event/_config.js b/test/runtime/samples/store-event/_config.js
new file mode 100644
index 0000000000..6f192ff76f
--- /dev/null
+++ b/test/runtime/samples/store-event/_config.js
@@ -0,0 +1,34 @@
+import Store from '../../../../store.js';
+
+class MyStore extends Store {
+	setName(name) {
+		this.set({ name });
+	}
+}
+
+const store = new MyStore({
+	name: 'world'
+});
+
+export default {
+	store,
+
+	html: `
+		<h1>Hello world!</h1>
+		<input>
+	`,
+
+	test(assert, component, target, window) {
+		const input = target.querySelector('input');
+		const event = new window.Event('input');
+
+		input.value = 'everybody';
+		input.dispatchEvent(event);
+
+		assert.equal(store.get('name'), 'everybody');
+		assert.htmlEqual(target.innerHTML, `
+			<h1>Hello everybody!</h1>
+			<input>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/store-event/main.html b/test/runtime/samples/store-event/main.html
new file mode 100644
index 0000000000..06410ea770
--- /dev/null
+++ b/test/runtime/samples/store-event/main.html
@@ -0,0 +1,10 @@
+<h1>Hello {{$name}}!</h1>
+<NameInput/>
+
+<script>
+	import NameInput from './NameInput.html';
+
+	export default {
+		components: { NameInput }
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/store-unexpected/input.html b/test/validator/samples/store-unexpected/input.html
new file mode 100644
index 0000000000..589f28e647
--- /dev/null
+++ b/test/validator/samples/store-unexpected/input.html
@@ -0,0 +1 @@
+<button on:click='store.foo()'>foo</button>
\ No newline at end of file
diff --git a/test/validator/samples/store-unexpected/warnings.json b/test/validator/samples/store-unexpected/warnings.json
new file mode 100644
index 0000000000..bac2841dc9
--- /dev/null
+++ b/test/validator/samples/store-unexpected/warnings.json
@@ -0,0 +1,8 @@
+[{
+	"message": "compile with `store: true` in order to call store methods",
+	"loc": {
+		"line": 1,
+		"column": 18
+	},
+	"pos": 18
+}]
\ No newline at end of file