diff --git a/addons/escoria-core/game/core-scripts/esc_item.gd b/addons/escoria-core/game/core-scripts/esc_item.gd
index 563378be..7a1188f7 100644
--- a/addons/escoria-core/game/core-scripts/esc_item.gd
+++ b/addons/escoria-core/game/core-scripts/esc_item.gd
@@ -168,6 +168,9 @@ var _movable: ESCMovable = null
 # The identified animation player
 var _animation_player: ESCAnimationPlayer = null
 
+# Whether to force regsitration with the object manager. Defaults to false.
+var _force_registration: bool = false
+
 
 # Add the movable node, connect signals, detect child nodes
 # and register this item
@@ -210,7 +213,7 @@ func _ready():
 				self
 			),
 			null,
-			true
+			_force_registration
 		)
 
 		terrain = escoria.room_terrain
diff --git a/addons/escoria-core/game/core-scripts/esc_location.gd b/addons/escoria-core/game/core-scripts/esc_location.gd
index 6c789c7a..487137c9 100644
--- a/addons/escoria-core/game/core-scripts/esc_location.gd
+++ b/addons/escoria-core/game/core-scripts/esc_location.gd
@@ -39,7 +39,5 @@ func _ready():
 			ESCObject.new(
 				self.global_id,
 				self
-			),
-			null,
-			true
+			)
 		)
diff --git a/addons/escoria-core/game/core-scripts/esc_player.gd b/addons/escoria-core/game/core-scripts/esc_player.gd
index 80d0a407..fb97dbb3 100644
--- a/addons/escoria-core/game/core-scripts/esc_player.gd
+++ b/addons/escoria-core/game/core-scripts/esc_player.gd
@@ -13,6 +13,7 @@ export(bool) var selectable = false
 # A player is always movable
 func _init():
 	is_movable = true
+	_force_registration = true
 
 
 # Ready function