diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index 30bf88501..19d483bab 100644
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -153,7 +153,7 @@ static int sromalgo_prepare(struct target *target)
 
 	/* Restore THUMB bit in xPSR register */
 	const struct armv7m_common *cm = target_to_armv7m(target);
-	hr = cm->store_core_reg_u32(target, ARMV7M_xPSR, 0x01000000);
+	hr = cm->store_core_reg_u32(target, ARMV7M_REGSEL_xPSR, 0x01000000);
 	if (hr != ERROR_OK)
 		return hr;
 
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 72a2bd322..ced7a8a67 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -530,7 +530,7 @@ static int cortex_m_debug_entry(struct target *target)
 	/* For IT instructions xPSR must be reloaded on resume and clear on debug exec */
 	if (xPSR & 0xf00) {
 		r->dirty = r->valid;
-		cortex_m_store_core_reg_u32(target, 16, xPSR & ~0xff);
+		cortex_m_store_core_reg_u32(target, ARMV7M_REGSEL_xPSR, xPSR & ~0xff);
 	}
 
 	/* Are we in an exception handler */