diff --git a/core/global/launch_manager.gd b/core/global/launch_manager.gd
index 47e8fd5a..d2cb28b0 100644
--- a/core/global/launch_manager.gd
+++ b/core/global/launch_manager.gd
@@ -299,9 +299,9 @@ func set_app_gamepad_profile(app: RunningApp) -> void:
 ## Sets the gamepad profile for the running app with the given profile
 func set_gamepad_profile(path: String, target_gamepad: String = "") -> void:
 	# Discover the currently set gamepad to properly add additional capabilities based on that gamepad
-	var profile_modifier = target_gamepad
+	var profile_modifier := target_gamepad
 	if target_gamepad.is_empty():
-		profile_modifier = settings_manager.get_value("input", "gamepad_profile_target", InputPlumber.DEFAULT_GLOBAL_PROFILE) as String
+		profile_modifier = settings_manager.get_value("input", "gamepad_profile_target", "gamepad") as String
 
 	# If no profile was specified, unset the gamepad profiles
 	if path == "":
diff --git a/core/systems/input/events/event.gd b/core/systems/input/events/event.gd
index 08f6f878..632602be 100644
--- a/core/systems/input/events/event.gd
+++ b/core/systems/input/events/event.gd
@@ -33,8 +33,6 @@ static func from_event(godot_event: InputEvent) -> InputPlumberEvent:
 		return null
 	elif godot_event is InputEventAction:
 		return null
-	elif godot_event is InputEventAction:
-		return null
 	
 	return null