diff --git a/src/arch/x86/boot.c b/src/arch/x86/boot.c
index d157f96380..8a6592f189 100644
--- a/src/arch/x86/boot.c
+++ b/src/arch/x86/boot.c
@@ -203,7 +203,7 @@ static void jmp_payload(void *entry, unsigned long buffer, unsigned long size)
 
 int arch_supports_bounce_buffer(void)
 {
-	return 1;
+	return !IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE);
 }
 
 int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size)
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index 42f7efcc28..4046649522 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -350,6 +350,15 @@ static int payload_targets_usable_ram(struct segment *head)
 		if (payload_arch_usable_ram_quirk(ptr->s_dstaddr, ptr->s_memsz))
 			continue;
 
+		if (arch_supports_bounce_buffer() &&
+			bootmem_region_usable_with_bounce(ptr->s_dstaddr,
+						      ptr->s_memsz)) {
+			printk(BIOS_DEBUG,
+				"Payload is loaded over non-relocatable "
+				"ramstage. Will use bounce-buffer.\n");
+			return 1;
+		}
+
 		/* Payload segment not targeting RAM. */
 		printk(BIOS_ERR, "SELF Payload doesn't target RAM:\n");
 		printk(BIOS_ERR, "Failed Segment: 0x%lx, %lu bytes\n",