diff --git a/4.18/wacom_wac.c b/4.18/wacom_wac.c
index 2b30c562..304e2042 100644
--- a/4.18/wacom_wac.c
+++ b/4.18/wacom_wac.c
@@ -2592,6 +2592,8 @@ static void wacom_wac_pen_report(struct hid_device *hdev,
 		/* Going into range select tool */
 		if (wacom_wac->hid_data.invert_state)
 			wacom_wac->tool[0] = BTN_TOOL_RUBBER;
+		else if (wacom_wac->features.quirks & WACOM_QUIRK_AESPEN)
+			wacom_wac->tool[0] = BTN_TOOL_PEN;
 		else if (wacom_wac->id[0])
 			wacom_wac->tool[0] = wacom_intuos_get_tool_type(wacom_wac->id[0]);
 		else