diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb01e55..26cdc00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.6
+- Fixed check for receiving events on different `baseUrl` - #55 and #57
+
 # 1.0.4
 - Now supporting `baseUrl` with different path than `/`
 
diff --git a/package-lock.json b/package-lock.json
index 7df47f1..0b3b14a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "react-drawio",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "react-drawio",
-      "version": "1.0.5",
+      "version": "1.0.6",
       "license": "MIT",
       "devDependencies": {
         "@rollup/plugin-node-resolve": "^16.0.0",
diff --git a/package.json b/package.json
index c8c801b..b5bf7e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-drawio",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "description": "React component for integrating the Diagrams (draw.io) embed iframe",
   "main": "index.js",
diff --git a/src/utils/handleEvent.ts b/src/utils/handleEvent.ts
index a2a0537..4eaf4fb 100644
--- a/src/utils/handleEvent.ts
+++ b/src/utils/handleEvent.ts
@@ -1,11 +1,22 @@
 import { EmbedEvents } from '../types';
 
 type EventHandler = {
-  [key in EmbedEvents['event']]?: (data: Extract<EmbedEvents, { event: key }>) => void;
+  [key in EmbedEvents['event']]?: (
+    data: Extract<EmbedEvents, { event: key }>
+  ) => void;
 };
 
-export function handleEvent(event: MessageEvent, handlers: EventHandler, baseUrl?: string) {
-  if (!event.origin.includes('embed.diagrams.net') && (baseUrl && !event.origin.includes(baseUrl))) {
+export function handleEvent(
+  event: MessageEvent,
+  handlers: EventHandler,
+  baseUrl?: string
+) {
+  if (
+    !event.origin.includes('embed.diagrams.net') &&
+    baseUrl &&
+    !baseUrl.includes(event.origin) &&
+    !event.origin.includes(baseUrl)
+  ) {
     return;
   }
 
@@ -23,4 +34,4 @@ export function handleEvent(event: MessageEvent, handlers: EventHandler, baseUrl
   } catch {
     //
   }
-};
+}
diff --git a/stories/DiagramsEmbed.stories.tsx b/stories/DiagramsEmbed.stories.tsx
index b040ef8..4306828 100644
--- a/stories/DiagramsEmbed.stories.tsx
+++ b/stories/DiagramsEmbed.stories.tsx
@@ -472,3 +472,9 @@ export const MergeMultiple: Story = {
     }
   ]
 };
+
+export const BaseUrl: Story = {
+  args: {
+    baseUrl: 'https://jgraph.github.io/drawio/src/main/webapp/index.html'
+  }
+};