diff --git a/scenes/game_elements/props/hint/input_key/gamepad_input.gd b/scenes/game_elements/props/hint/input_key/gamepad_input.gd
index 2fc86f262..2983c119e 100644
--- a/scenes/game_elements/props/hint/input_key/gamepad_input.gd
+++ b/scenes/game_elements/props/hint/input_key/gamepad_input.gd
@@ -80,10 +80,7 @@ func _physics_process(_delta: float) -> void:
 
 func _ready() -> void:
 	InputHelper.device_changed.connect(_on_input_device_changed)
-	_on_input_device_changed(
-		InputHelper.last_known_joypad_device,
-		InputHelper.last_known_joypad_index,
-	)
+	_on_input_device_changed(InputHelper.device, InputHelper.device_index)
 
 
 func _on_input_device_changed(device: String, _device_index: int) -> void:
diff --git a/scenes/game_elements/props/hint/input_key/interact_input.gd b/scenes/game_elements/props/hint/input_key/interact_input.gd
index 19054afa8..b480e4552 100644
--- a/scenes/game_elements/props/hint/input_key/interact_input.gd
+++ b/scenes/game_elements/props/hint/input_key/interact_input.gd
@@ -28,10 +28,7 @@ func _physics_process(_delta: float) -> void:
 
 func _ready() -> void:
 	InputHelper.device_changed.connect(_on_input_device_changed)
-	_on_input_device_changed(
-		InputHelper.last_known_joypad_device,
-		InputHelper.last_known_joypad_index,
-	)
+	_on_input_device_changed(InputHelper.device, InputHelper.device_index)
 
 
 func _on_input_device_changed(device: String, _device_index: int) -> void:
diff --git a/scenes/game_elements/props/hint/input_key/keyboard_input.gd b/scenes/game_elements/props/hint/input_key/keyboard_input.gd
index 7bd96328f..224460b52 100644
--- a/scenes/game_elements/props/hint/input_key/keyboard_input.gd
+++ b/scenes/game_elements/props/hint/input_key/keyboard_input.gd
@@ -20,10 +20,7 @@ func _physics_process(_delta: float) -> void:
 
 func _ready() -> void:
 	InputHelper.device_changed.connect(_on_input_device_changed)
-	_on_input_device_changed(
-		InputHelper.last_known_joypad_device,
-		InputHelper.last_known_joypad_index,
-	)
+	_on_input_device_changed(InputHelper.device, InputHelper.device_index)
 
 
 func _on_input_device_changed(device: String, _device_index: int) -> void: