diff --git a/include/spdk/trace.h b/include/spdk/trace.h
index d246aa105..5c6c83693 100644
--- a/include/spdk/trace.h
+++ b/include/spdk/trace.h
@@ -195,6 +195,7 @@ void spdk_trace_record(uint16_t tpoint_id, uint16_t poller_id, uint32_t size,
 	 *  within the group, the remaining upper bits determine the tracepoint group.  Each
 	 *  tracepoint group has its own tracepoint mask.
 	 */
+	assert(tpoint_id < SPDK_TRACE_MAX_TPOINT_ID);
 	if (g_trace_histories == NULL ||
 	    !((1ULL << (tpoint_id & 0x3F)) & g_trace_histories->flags.tpoint_mask[tpoint_id >> 6])) {
 		return;
@@ -224,6 +225,7 @@ void spdk_trace_record_tsc(uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
 	 *  within the group, the remaining upper bits determine the tracepoint group.  Each
 	 *  tracepoint group has its own tracepoint mask.
 	 */
+	assert(tpoint_id < SPDK_TRACE_MAX_TPOINT_ID);
 	if (g_trace_histories == NULL ||
 	    !((1ULL << (tpoint_id & 0x3F)) & g_trace_histories->flags.tpoint_mask[tpoint_id >> 6])) {
 		return;