diff --git a/src/gallium/drivers/iris/iris_defines.h b/src/gallium/drivers/iris/iris_defines.h
index fce73551670..9e3e24231c7 100644
--- a/src/gallium/drivers/iris/iris_defines.h
+++ b/src/gallium/drivers/iris/iris_defines.h
@@ -52,9 +52,6 @@
 
 #define CS_GPR(n) (0x2600 + (n) * 8)
 
-/* The number of bits in our TIMESTAMP queries. */
-#define TIMESTAMP_BITS 36
-
 /* For gfx12 we set the streamout buffers using 4 separate commands
  * (3DSTATE_SO_BUFFER_INDEX_*) instead of 3DSTATE_SO_BUFFER. However the layout
  * of the 3DSTATE_SO_BUFFER_INDEX_* commands is identical to that of
diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index 6ea9c8917e6..6f724932cf4 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -282,7 +282,7 @@ static uint64_t
 iris_raw_timestamp_delta(uint64_t time0, uint64_t time1)
 {
    if (time0 > time1) {
-      return (1ULL << TIMESTAMP_BITS) + time1 - time0;
+      return (1ull << 36) + time1 - time0;
    } else {
       return time1 - time0;
    }
@@ -309,12 +309,10 @@ calculate_result_on_cpu(const struct intel_device_info *devinfo,
    case PIPE_QUERY_TIMESTAMP_DISJOINT:
       /* The timestamp is the single starting snapshot. */
       q->result = intel_device_info_timebase_scale(devinfo, q->map->start);
-      q->result &= (1ull << TIMESTAMP_BITS) - 1;
       break;
    case PIPE_QUERY_TIME_ELAPSED:
       q->result = iris_raw_timestamp_delta(q->map->start, q->map->end);
       q->result = intel_device_info_timebase_scale(devinfo, q->result);
-      q->result &= (1ull << TIMESTAMP_BITS) - 1;
       break;
    case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
       q->result = stream_overflowed((void *) q->map, q->index);
diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c
index 5d8c3b49da6..0eb54494b25 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/src/gallium/drivers/iris/iris_screen.c
@@ -429,9 +429,6 @@ iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
        */
       return devinfo->ver >= 11;
 
-   case PIPE_CAP_QUERY_TIMESTAMP_BITS:
-      return TIMESTAMP_BITS;
-
    case PIPE_CAP_TIMER_RESOLUTION:
       return DIV_ROUND_UP(1000000000ull, devinfo->timestamp_frequency);
 
@@ -657,7 +654,6 @@ iris_get_timestamp(struct pipe_screen *pscreen)
       return 0;
 
    result = intel_device_info_timebase_scale(screen->devinfo, result);
-   result &= (1ull << TIMESTAMP_BITS) - 1;
 
    return result;
 }