diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 8d23bcabc..d111a0568 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -2504,8 +2504,13 @@ static int aarch64_jim_configure(struct target *target, Jim_GetOptInfo *goi)
 	 * options, JIM_OK if it correctly parsed the topmost option
 	 * and JIM_ERR if an error occurred during parameter evaluation.
 	 * For JIM_CONTINUE, we check our own params.
+	 *
+	 * adiv5_jim_configure() assumes 'private_config' to point to
+	 * 'struct adiv5_private_config'. Override 'private_config'!
 	 */
+	target->private_config = &pc->adiv5_config;
 	e = adiv5_jim_configure(target, goi);
+	target->private_config = pc;
 	if (e != JIM_CONTINUE)
 		return e;