diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml
index 795fa3a433..60232ea181 100644
--- a/bin/resources/GameIndex.yaml
+++ b/bin/resources/GameIndex.yaml
@@ -30954,7 +30954,7 @@ SLPM-66302:
   name: "Clannad"
   region: "NTSC-J"
   gsHWFixes:
-    pointListPalette: 1
+    cpuCLUTRender: 1 # Fixes colours.
 SLPM-66307:
   name: "Sengoku Musou 2"
   region: "NTSC-J"
@@ -32100,7 +32100,7 @@ SLPM-66611:
   name: "Tomoyo After - It's Wonderful Life [CS Edition]"
   region: "NTSC-J"
   gsHWFixes:
-    pointListPalette: 1
+    cpuCLUTRender: 1 # Fixes Colours.
 SLPM-66612:
   name: "School Love [Limited Edition]"
   region: "NTSC-J"
diff --git a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
index 2571621622..207cb25ce1 100644
--- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
@@ -3904,8 +3904,8 @@ bool GSRendererHW::PossibleCLUTDraw()
 	// Keep the draws simple, no alpha testing, blending, mipmapping, Z writes, and make sure it's flat.
 	const bool fb_only = m_context->TEST.ATE && m_context->TEST.AFAIL == 1 && m_context->TEST.ATST == ATST_NEVER;
 
-	// No Z writes.
-	if (!m_context->ZBUF.ZMSK && !fb_only)
+	// No Z writes, unless it's points, then it's quite likely to be a palette and they left it on.
+	if (!m_context->ZBUF.ZMSK && !fb_only && !(m_vt.m_primclass == GS_POINT_CLASS))
 		return false;
 
 	// Make sure it's flat.