diff --git a/packages/webpack-rsc/src/webpack-rsc-server-loader.cts b/packages/webpack-rsc/src/webpack-rsc-server-loader.cts
index 146005c..26e1ce0 100644
--- a/packages/webpack-rsc/src/webpack-rsc-server-loader.cts
+++ b/packages/webpack-rsc/src/webpack-rsc-server-loader.cts
@@ -21,6 +21,8 @@ namespace webpackRscServerLoader {
   }
 }
 
+type RegisterReferenceType = 'Server' | 'Client';
+
 function webpackRscServerLoader(
   this: webpack.LoaderContext<webpackRscServerLoader.WebpackRscServerLoaderOptions>,
   source: string,
@@ -28,6 +30,7 @@ function webpackRscServerLoader(
   this.cacheable(true);
 
   const {clientReferencesMap} = this.getOptions();
+  const clientReferences: webpackRscServerLoader.ClientReference[] = [];
   const resourcePath = this.resourcePath;
 
   const ast = parser.parse(source, {
@@ -36,8 +39,8 @@ function webpackRscServerLoader(
   });
 
   let moduleDirective: 'use client' | 'use server' | undefined;
-  let addedRegisterServerReferenceCall = false;
-  const clientReferences: webpackRscServerLoader.ClientReference[] = [];
+  let addedRegisterReferenceCall: RegisterReferenceType | undefined;
+  const unshiftedNodes = new Set<t.Node>();
 
   traverse.default(ast, {
     enter(nodePath) {
@@ -57,8 +60,8 @@ function webpackRscServerLoader(
 
       if (
         !moduleDirective ||
-        (t.isDirective(node) &&
-          (isDirective(`use client`)(node) || isDirective(`use server`)(node)))
+        (t.isDirective(node) && isDirective(`use client`)(node)) ||
+        unshiftedNodes.has(node)
       ) {
         nodePath.skip();
 
@@ -69,31 +72,43 @@ function webpackRscServerLoader(
 
       if (moduleDirective === `use client`) {
         if (exportName) {
-          const id = `${path.relative(
-            process.cwd(),
-            resourcePath,
-          )}#${exportName}`;
-
+          const id = `${path.relative(process.cwd(), resourcePath)}`;
           clientReferences.push({id, exportName});
+          addedRegisterReferenceCall = `Client`;
           nodePath.replaceWith(createExportedClientReference(id, exportName));
           nodePath.skip();
         } else {
           nodePath.remove();
         }
       } else if (exportName) {
-        addedRegisterServerReferenceCall = true;
+        addedRegisterReferenceCall = `Server`;
         nodePath.insertAfter(createRegisterServerReference(exportName));
         nodePath.skip();
       }
     },
     exit(nodePath) {
-      const {node} = nodePath;
+      if (!t.isProgram(nodePath.node) || !addedRegisterReferenceCall) {
+        nodePath.skip();
+
+        return;
+      }
+
+      const nodes: t.Node[] = [
+        createRegisterReferenceImport(addedRegisterReferenceCall),
+      ];
 
-      if (t.isProgram(node) && addedRegisterServerReferenceCall) {
-        (nodePath as traverse.NodePath<t.Program>).unshiftContainer(`body`, [
-          creatRegisterServerReferenceImport(),
-        ]);
+      if (addedRegisterReferenceCall === `Client`) {
+        nodes.push(createClientReferenceProxyImplementation());
       }
+
+      for (const node of nodes) {
+        unshiftedNodes.add(node);
+      }
+
+      (nodePath as traverse.NodePath<t.Program>).unshiftContainer(
+        `body`,
+        nodes,
+      );
     },
   });
 
@@ -143,21 +158,51 @@ function createExportedClientReference(
     t.variableDeclaration(`const`, [
       t.variableDeclarator(
         t.identifier(exportName),
-        t.objectExpression([
-          t.objectProperty(
-            t.identifier(`$$typeof`),
-            t.callExpression(
-              t.memberExpression(t.identifier(`Symbol`), t.identifier(`for`)),
-              [t.stringLiteral(`react.client.reference`)],
-            ),
-          ),
-          t.objectProperty(t.identifier(`$$id`), t.stringLiteral(id)),
+        t.callExpression(t.identifier(`registerClientReference`), [
+          t.callExpression(t.identifier(`createClientReferenceProxy`), [
+            t.stringLiteral(exportName),
+          ]),
+          t.stringLiteral(id),
+          t.stringLiteral(exportName),
         ]),
       ),
     ]),
   );
 }
 
+function createClientReferenceProxyImplementation(): t.FunctionDeclaration {
+  return t.functionDeclaration(
+    t.identifier(`createClientReferenceProxy`),
+    [t.identifier(`exportName`)],
+    t.blockStatement([
+      t.returnStatement(
+        t.arrowFunctionExpression(
+          [],
+          t.blockStatement([
+            t.throwStatement(
+              t.newExpression(t.identifier(`Error`), [
+                t.templateLiteral(
+                  [
+                    t.templateElement({raw: `Attempted to call `}),
+                    t.templateElement({raw: `() from the server but `}),
+                    t.templateElement(
+                      {
+                        raw: ` is on the client. It's not possible to invoke a client function from the server, it can only be rendered as a Component or passed to props of a Client Component.`,
+                      },
+                      true,
+                    ),
+                  ],
+                  [t.identifier(`exportName`), t.identifier(`exportName`)],
+                ),
+              ]),
+            ),
+          ]),
+        ),
+      ),
+    ]),
+  );
+}
+
 function createRegisterServerReference(exportName: string): t.CallExpression {
   return t.callExpression(t.identifier(`registerServerReference`), [
     t.identifier(exportName),
@@ -166,12 +211,14 @@ function createRegisterServerReference(exportName: string): t.CallExpression {
   ]);
 }
 
-function creatRegisterServerReferenceImport(): t.ImportDeclaration {
+function createRegisterReferenceImport(
+  type: RegisterReferenceType,
+): t.ImportDeclaration {
   return t.importDeclaration(
     [
       t.importSpecifier(
-        t.identifier(`registerServerReference`),
-        t.identifier(`registerServerReference`),
+        t.identifier(`register${type}Reference`),
+        t.identifier(`register${type}Reference`),
       ),
     ],
     t.stringLiteral(`react-server-dom-webpack/server`),
diff --git a/packages/webpack-rsc/src/webpack-rsc-server-loader.test.ts b/packages/webpack-rsc/src/webpack-rsc-server-loader.test.ts
index 303c23d..673fbc1 100644
--- a/packages/webpack-rsc/src/webpack-rsc-server-loader.test.ts
+++ b/packages/webpack-rsc/src/webpack-rsc-server-loader.test.ts
@@ -56,24 +56,21 @@ describe(`webpackRscServerLoader`, () => {
     );
 
     const output = await callLoader(resourcePath, clientReferencesMap);
-    const idPrefix = path.relative(process.cwd(), resourcePath);
+    const expectedId = path.relative(process.cwd(), resourcePath);
 
     expect(output).toEqual(
       `
 'use client';
 
-export const ComponentA = {
-  $$typeof: Symbol.for("react.client.reference"),
-  $$id: "${idPrefix}#ComponentA"
-};
-export const ComponentB = {
-  $$typeof: Symbol.for("react.client.reference"),
-  $$id: "${idPrefix}#ComponentB"
-};
-export const ComponentC = {
-  $$typeof: Symbol.for("react.client.reference"),
-  $$id: "${idPrefix}#ComponentC"
-};
+import { registerClientReference } from "react-server-dom-webpack/server";
+function createClientReferenceProxy(exportName) {
+  return () => {
+    throw new Error(\`Attempted to call \${exportName}() from the server but \${exportName} is on the client. It's not possible to invoke a client function from the server, it can only be rendered as a Component or passed to props of a Client Component.\`);
+  };
+}
+export const ComponentA = registerClientReference(createClientReferenceProxy("ComponentA"), "${expectedId}", "ComponentA");
+export const ComponentB = registerClientReference(createClientReferenceProxy("ComponentB"), "${expectedId}", "ComponentB");
+export const ComponentC = registerClientReference(createClientReferenceProxy("ComponentC"), "${expectedId}", "ComponentC");
 `.trim(),
     );
   });