diff --git a/debian/changelog b/debian/changelog
index 5c0ce4b1..9929080a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (24.04.86) UNRELEASED; urgency=medium
+
+  * Do not build HWE kernel layer on RISC-V as there is no HWE kernel there.
+    (LP: #2098622)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 17 Feb 2025 11:12:00 +1300
+
 livecd-rootfs (24.04.85) noble; urgency=medium
 
   * Fix build failure when using lowlatency-hwe-24.04, as ubuntustudio does.
diff --git a/live-build/auto/config b/live-build/auto/config
index f298fb3c..1eee2c1f 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -999,6 +999,11 @@ case $PROJECT in
 						;;
 				esac
 
+				if [ $ARCH = "riscv64" ]; then
+					# For RISC-V we only offer one kernel
+					variants='ga'
+				fi
+
 				for variant in $variants; do
 					if [ "$variant" = "ga" ]; then
 						kernel_metapkg=linux-generic