diff --git a/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c b/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c
index b6765a6..2549d35 100644
--- a/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c
+++ b/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#if defined(SPD_spmd)
+#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
 /*
  * A dummy implementation of the platform handler for Group0 secure interrupt.
  */
@@ -15,4 +15,4 @@
 	(void)intid;
 	return -1;
 }
-#endif /*defined(SPD_spmd)*/
+#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/
diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
index 6809541..bd05660 100644
--- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
+++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
@@ -160,7 +160,7 @@
 		remote_dmc_ecc_setup(plat_info.remote_ddr_size);
 }
 
-#if defined(SPD_spmd)
+#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
 /*
  * A dummy implementation of the platform handler for Group0 secure interrupt.
  */
@@ -169,4 +169,4 @@
 	(void)intid;
 	return -1;
 }
-#endif /*defined(SPD_spmd)*/
+#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/
diff --git a/plat/arm/board/tc/tc_bl31_setup.c b/plat/arm/board/tc/tc_bl31_setup.c
index 630324f..6afbd99 100644
--- a/plat/arm/board/tc/tc_bl31_setup.c
+++ b/plat/arm/board/tc/tc_bl31_setup.c
@@ -83,7 +83,7 @@
 	fconf_populate("HW_CONFIG", hw_config_info->config_addr);
 }
 
-#if defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)
+#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
 void tc_bl31_plat_runtime_setup(void)
 {
 	arm_bl31_plat_runtime_setup();
@@ -115,4 +115,4 @@
 
 	return -1;
 }
-#endif /*defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)*/
+#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/
diff --git a/plat/hisilicon/hikey960/hikey960_bl31_setup.c b/plat/hisilicon/hikey960/hikey960_bl31_setup.c
index 1d7bc94..159eee9 100644
--- a/plat/hisilicon/hikey960/hikey960_bl31_setup.c
+++ b/plat/hisilicon/hikey960/hikey960_bl31_setup.c
@@ -245,7 +245,7 @@
 
 	return 0;
 }
-#elif defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)
+#elif defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
 /*
  * A dummy implementation of the platform handler for Group0 secure interrupt.
  */
diff --git a/plat/qemu/common/qemu_common.c b/plat/qemu/common/qemu_common.c
index 9aec213..98be491 100644
--- a/plat/qemu/common/qemu_common.c
+++ b/plat/qemu/common/qemu_common.c
@@ -163,7 +163,7 @@
 }
 #endif
 
-#if defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)
+#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
 /*
  * A dummy implementation of the platform handler for Group0 secure interrupt.
  */
@@ -172,4 +172,4 @@
 	(void)intid;
 	return -1;
 }
-#endif /*defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)*/
+#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/