diff --git a/qcom/lahaina-v2.dtsi b/qcom/lahaina-v2.dtsi
index 1391441bb5d8..a390fd1bf7e1 100644
--- a/qcom/lahaina-v2.dtsi
+++ b/qcom/lahaina-v2.dtsi
@@ -22,6 +22,11 @@
 	dynamic-power-coefficient = <760>;
 };
 
+&kryo_erp {
+
+	/delete-property/ qcom,disable-panic-on-ce;
+};
+
 &sde_dp {
 	/delete-node/ qcom,pll-supply-entries;
 };
diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index bc26eca67236..f734b77a1be6 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -3240,11 +3240,12 @@
 		};
 	};
 
-	kryo-erp {
+	kryo_erp: erp {
 		compatible = "arm,arm64-kryo-cpu-erp";
 		interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>,
 			<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "l1-l2-faultirq","l3-scu-faultirq";
+		qcom,disable-panic-on-ce;
 	};
 
 	tcsr_mutex_block: syscon@1f40000 {