diff --git a/qcom/pineapple.dtsi b/qcom/pineapple.dtsi
index 70b565fc..db7e4c85 100644
--- a/qcom/pineapple.dtsi
+++ b/qcom/pineapple.dtsi
@@ -47,9 +47,10 @@
 
 	mem-offline {
 		compatible = "qcom,mem-offline";
-		offline-sizes = <0x2 0xc0000000 0x1 0x40000000>;
+		status="disabled";
+		offline-sizes = <0x2 0xc0000000 0x1 0x0>;
 		granule = <512>;
-		mboxes = <&qmp_aop 0>;
+		qcom,qmp = <&aoss_qmp>;
 	};
 
 	firmware: firmware { };
diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index b34a6690..4c15e9d7 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -33,7 +33,7 @@
 
 
 	chosen: chosen {
-		bootargs = "nokaslr kpti=0 log_buf_len=256K swiotlb=0 loop.max_part=7 pcie_ports=compat";
+		bootargs = "nokaslr kpti=0 log_buf_len=256K swiotlb=0 loop.max_part=7 pcie_ports=compat mem-offline.bypass_send_msg=1";
 		stdout-path = "/soc/qcom,qupv3_1_geni_se@ac0000/qcom,qup_uart@a9c000:115200n8";
 	};
 
@@ -253,6 +253,14 @@
 
 	reserved_memory: reserved-memory { };
 
+	mem-offline {
+		compatible = "qcom,mem-offline";
+		status="disabled";
+		offline-sizes = <0x2 0xc0000000 0x1 0x0>;
+		granule = <512>;
+		qcom,qmp = <&aoss_qmp>;
+	};
+
 	soc: soc { };
 };