diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58c41dc..b8211cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## In development
+### Other
+- Smart Doors is now compatible with Arms Reach
+
 ## v1.2.2
 ### Bugfix
 - Disabled features are now less likely to interfere with other modules, increasing compatibility.
diff --git a/lang/en.json b/lang/en.json
index 4b94d0b..00a9dd3 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -28,7 +28,6 @@
 		},
 		"ui": {
 			"messages": {
-				"armsReachIncompatiblilty": "You have the modules Smart Doors and Arms Reach activated. Those modules are known to conflict with each other. To resolve the conflict please disable either the \"Toggle Secret Doors\" setting of Smart Doors or the \"Hotkey 'e' for interaction\" setting of Arms Reach.",
 				"migrating": "Migrating Smart Doors to version {version}. Please don't close the application.",
 				"migrationDone": "Smart Doors successfully migrated to version {version}.",
 				"unknownVersion": "Smart Doors migration failed with the error: Unkown Version {version}. Please report this to the Smart Doors issue tracker. To prevent possible data loss don't use this plugin until this error is fixed."
diff --git a/src/features/toggle_secret_door.js b/src/features/toggle_secret_door.js
index b2c73c1..eeeb168 100644
--- a/src/features/toggle_secret_door.js
+++ b/src/features/toggle_secret_door.js
@@ -2,7 +2,8 @@ import {settingsKey} from "../settings.js"
 
 // Toggles between normal and secret doors
 export function onDoorLeftClick(event) {
-	if (game.settings.get(settingsKey, "toggleSecretDoors") && event.data.originalEvent.ctrlKey && game.user.isGM) {
+	// We don't trust the event to be filled with the expected data for compatibilty with arms reach (which passes a broken event)
+	if (game.settings.get(settingsKey, "toggleSecretDoors") && event.data?.originalEvent?.ctrlKey && game.user.isGM) {
 		const types = CONST.WALL_DOOR_TYPES
 		const newtype = this.wall.data.door === types.DOOR ? types.SECRET : types.DOOR
 		this.wall.update({door: newtype})
diff --git a/src/main.js b/src/main.js
index f74952d..3f9e530 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,17 +20,6 @@ Hooks.once("init", () => {
 
 Hooks.once("ready", () => {
 	performMigrations()
-
-	// Check if arms-reach module is active and conflicting features are enabled
-	if (game.user.isGM && game.modules.get("arms-reach")?.active) {
-		// Our toggle-secret-door and arms-reach's hotkeyDoorInteraction conflict. Check if both are enabled.
-		if (game.settings.get(settingsKey, "toggleSecretDoors") && game.settings.get("arms-reach", "hotkeyDoorInteraction")) {
-			// Inform the user that they have incompatible features enabled
-			const incopatibilityMessage = game.i18n.localize("smart-doors.ui.messages.armsReachIncompatiblilty")
-			console.warn("Smart Doors | " + incopatibilityMessage)
-			ui.notifications.warn(incopatibilityMessage, {permanent: true})
-		}
-	}
 })
 
 Hooks.on("renderChatMessage", LockedDoorAlert.onRenderChatMessage)