diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
index 8aae00c91c..bc9e989b20 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
@@ -6,6 +6,7 @@ import { get_rune } from '../../../scope.js';
 import { transform_inspect_rune } from '../../utils.js';
 import * as e from '../../../../errors.js';
 import { should_proxy } from '../utils.js';
+import { get_name } from '../../../nodes.js';
 
 /**
  * @param {CallExpression} node
@@ -83,21 +84,14 @@ export function CallExpression(node, context) {
 			} else if (node.arguments[0].type === 'MemberExpression') {
 				const { object, property } = node.arguments[0];
 				if (object.type === 'ThisExpression') {
-					let field;
-					switch (property.type) {
-						case 'Identifier':
-							field = context.state.public_state.get(property.name);
-							break;
-						case 'PrivateIdentifier':
-							field = context.state.private_state.get(property.name);
-							break;
-					}
-					if (!field || (field.kind !== 'state' && field.kind !== 'raw_state')) {
+					const name = /** @type {string} */ (get_name(property));
+					const field = context.state.state_fields.get(name);
+					if (!field || (field.type !== '$state' && field.type !== '$state.raw')) {
 						e.state_invalidate_nonreactive_argument(node);
 					}
 					return b.call(
 						attach_locations(/** @type {Expression} */ (node.callee), b.id('$.invalidate')),
-						attach_locations(node.arguments[0], b.member(object, field.id))
+						attach_locations(node.arguments[0], b.member(object, field.key))
 					);
 				}
 				/** @type {Expression[]} */
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
index cc1090dd84..414c1d6a31 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
@@ -27,7 +27,7 @@ export function CallExpression(node, context) {
 
 	if (rune === '$state.invalidate') {
 		return b.void0;
-  }
+	}
 
 	if (rune === '$effect.pending') {
 		return b.literal(0);
diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js
index 6536324765..21b03dd2ca 100644
--- a/packages/svelte/src/internal/client/proxy.js
+++ b/packages/svelte/src/internal/client/proxy.js
@@ -165,7 +165,7 @@ export function proxy(value) {
 
 			if (prop === PROXY_SOURCES) {
 				return sources;
-      }
+			}
 
 			if (DEV && prop === PROXY_PATH_SYMBOL) {
 				return update_path;
diff --git a/packages/svelte/src/utils.js b/packages/svelte/src/utils.js
index d5cb5cdca1..efe717844e 100644
--- a/packages/svelte/src/utils.js
+++ b/packages/svelte/src/utils.js
@@ -430,7 +430,6 @@ export function is_mathml(name) {
 
 const STATE_CREATION_RUNES = /** @type {const} */ ([
 	'$state',
-	'$state.invalidate',
 	'$state.raw',
 	'$derived',
 	'$derived.by'
@@ -438,6 +437,7 @@ const STATE_CREATION_RUNES = /** @type {const} */ ([
 
 const RUNES = /** @type {const} */ ([
 	...STATE_CREATION_RUNES,
+	'$state.invalidate',
 	'$state.snapshot',
 	'$props',
 	'$props.id',