diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
index 948e6334ee..12137cea39 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -64,6 +64,7 @@ SDK_TOOLCHAIN_LANGS:remove:sdkmingw32 = "rust"
 SDK_TOOLCHAIN_LANGS:remove:mipsarchn32 = "rust"
 # go will not build for x86-x32 or mingw
 SDK_TOOLCHAIN_LANGS:remove:linux-gnux32 = "go"
+SDK_TOOLCHAIN_LANGS:remove:riscv32 = "go"
 SDK_TOOLCHAIN_LANGS:remove:sdkmingw32 = "go"
 
 TOOLCHAIN_HOST_TASK ?= " \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 84e1a41d9a..3a41259769 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -14,6 +14,7 @@ TARGET_TOOLCHAIN_LANGS ??= "${SDK_TOOLCHAIN_LANGS}"
 TARGET_TOOLCHAIN_LANGS:remove:sdkmingw32 = "rust"
 # libstd-rs doesn't build for mips n32 with compiler constraint errors
 TARGET_TOOLCHAIN_LANGS:remove:mipsarchn32 = "rust"
+TARGET_TOOLCHAIN_LANGS:remove:riscv32 = "go"
 
 RDEPENDS:packagegroup-core-sdk = "\
     packagegroup-core-buildessential \