diff --git a/src/excalidraw-app/index.tsx b/src/excalidraw-app/index.tsx
index 5451a9c8..75f5ae14 100644
--- a/src/excalidraw-app/index.tsx
+++ b/src/excalidraw-app/index.tsx
@@ -19,7 +19,8 @@ import {
 } from "../element/types";
 import { useCallbackRefState } from "../hooks/useCallbackRefState";
 import { Language, t } from "../i18n";
-import Excalidraw, {
+import {
+  Excalidraw,
   defaultLang,
   languages,
 } from "../packages/excalidraw/index";
diff --git a/src/packages/excalidraw/entry.js b/src/packages/excalidraw/entry.js
index 8915a125..e5d4a20a 100644
--- a/src/packages/excalidraw/entry.js
+++ b/src/packages/excalidraw/entry.js
@@ -1,6 +1,3 @@
-import Excalidraw from "./index";
-
 import "../../../public/fonts.css";
 
-export { Excalidraw };
 export * from "./index";
diff --git a/src/packages/excalidraw/index.tsx b/src/packages/excalidraw/index.tsx
index 05bb3a34..a3937bbb 100644
--- a/src/packages/excalidraw/index.tsx
+++ b/src/packages/excalidraw/index.tsx
@@ -13,7 +13,7 @@ import { DEFAULT_UI_OPTIONS } from "../../constants";
 import { Provider } from "jotai";
 import { jotaiScope, jotaiStore } from "../../jotai";
 
-const Excalidraw = (props: ExcalidrawProps) => {
+const ExcalidrawBase = (props: ExcalidrawProps) => {
   const {
     onChange,
     initialData,
@@ -173,8 +173,10 @@ const areEqual = (
 const forwardedRefComp = forwardRef<
   ExcalidrawAPIRefValue,
   PublicExcalidrawProps
->((props, ref) => <Excalidraw {...props} excalidrawRef={ref} />);
-export default React.memo(forwardedRefComp, areEqual);
+>((props, ref) => <ExcalidrawBase {...props} excalidrawRef={ref} />);
+
+export const Excalidraw = React.memo(forwardedRefComp, areEqual);
+
 export {
   getSceneVersion,
   isInvisiblySmallElement,
diff --git a/src/tests/packages/excalidraw.test.tsx b/src/tests/packages/excalidraw.test.tsx
index d0e22c6d..1007fd88 100644
--- a/src/tests/packages/excalidraw.test.tsx
+++ b/src/tests/packages/excalidraw.test.tsx
@@ -1,5 +1,5 @@
 import { fireEvent, GlobalTestState, render } from "../test-utils";
-import Excalidraw from "../../packages/excalidraw/index";
+import { Excalidraw } from "../../packages/excalidraw/index";
 import { queryByText, queryByTestId } from "@testing-library/react";
 import { GRID_SIZE, THEME } from "../../constants";
 import { t } from "../../i18n";
diff --git a/src/tests/scroll.test.tsx b/src/tests/scroll.test.tsx
index 70a115a5..1105352d 100644
--- a/src/tests/scroll.test.tsx
+++ b/src/tests/scroll.test.tsx
@@ -4,7 +4,7 @@ import {
   restoreOriginalGetBoundingClientRect,
   waitFor,
 } from "./test-utils";
-import Excalidraw from "../packages/excalidraw/index";
+import { Excalidraw } from "../packages/excalidraw/index";
 import { API } from "./helpers/api";
 
 const { h } = window;