diff --git a/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_copy_to_ram.ld b/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_copy_to_ram.ld
index bed8e773450..35505dbdd0b 100644
--- a/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_copy_to_ram.ld
+++ b/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_copy_to_ram.ld
@@ -256,11 +256,10 @@ SECTIONS
         __end__ = .;
         end = __end__;
         KEEP(*(.heap*))
-        /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
-           to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
-        . = ORIGIN(RAM) + LENGTH(RAM);
-        __HeapLimit = .;
     } > RAM
+    /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
+       to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
+    __HeapLimit = ORIGIN(RAM) + LENGTH(RAM);
 
     /* Start and end symbols must be word-aligned */
     .scratch_x : {
diff --git a/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_default.ld b/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_default.ld
index c0bdae1df84..c5a87098eb9 100644
--- a/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_default.ld
+++ b/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_default.ld
@@ -269,11 +269,10 @@ SECTIONS
         __end__ = .;
         end = __end__;
         KEEP(*(.heap*))
-        /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
-           to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
-        . = ORIGIN(RAM) + LENGTH(RAM);
-        __HeapLimit = .;
     } > RAM
+    /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
+       to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
+    __HeapLimit = ORIGIN(RAM) + LENGTH(RAM);
 
     /* Start and end symbols must be word-aligned */
     .scratch_x : {
diff --git a/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_no_flash.ld b/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_no_flash.ld
index 53052465291..0a5bedfe064 100644
--- a/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_no_flash.ld
+++ b/boards/arm/rp23xx/xiao-rp2350/scripts/memmap_no_flash.ld
@@ -215,11 +215,10 @@ SECTIONS
         __end__ = .;
         end = __end__;
         KEEP(*(.heap*))
-        /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
-           to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
-        . = ORIGIN(RAM) + LENGTH(RAM);
-        __HeapLimit = .;
     } > RAM
+    /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
+       to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
+    __HeapLimit = ORIGIN(RAM) + LENGTH(RAM);
 
     /* Start and end symbols must be word-aligned */
     .scratch_x : {