diff --git a/conf/machine/baremetal-riscv64.conf b/conf/machine/baremetal-riscv64.conf
index 7ee34e1a..d2e99e32 100644
--- a/conf/machine/baremetal-riscv64.conf
+++ b/conf/machine/baremetal-riscv64.conf
@@ -4,3 +4,6 @@
 
 require include/baremetal-riscv.inc
 DEFAULTTUNE = "riscv64"
+
+# Override the GCCPIE flag to an empty string to support PIE with the elf toolchain
+GCCPIE = ""