diff --git a/lib/xarray.c b/lib/xarray.c
index 1fa5c5658e63..2046d676ab41 100644
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -703,7 +703,7 @@ void xas_create_range(struct xa_state *xas)
 	unsigned char shift = xas->xa_shift;
 	unsigned char sibs = xas->xa_sibs;
 
-	xas->xa_index |= ((sibs + 1) << shift) - 1;
+	xas->xa_index |= ((sibs + 1UL) << shift) - 1;
 	if (xas_is_node(xas) && xas->xa_node->shift == xas->xa_shift)
 		xas->xa_offset |= sibs;
 	xas->xa_shift = 0;