diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 1aeb199a9553..6c99148cb949 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -1897,8 +1897,7 @@ int hif_config_ce(struct hif_softc *scn)
 		if (pipe_num == DIAG_CE_ID) {
 			/* Reserve the ultimate CE for
 			 * Diagnostic Window support */
-			hif_state->ce_diag =
-				hif_state->pipe_info[scn->ce_count - 1].ce_hdl;
+			hif_state->ce_diag = pipe_info->ce_hdl;
 			continue;
 		}