diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c
index 6825cfbad3d..4ffde7fe2dc 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -2297,7 +2297,7 @@ radv_get_physical_device_queue_family_properties(struct radv_physical_device *pd
             *pQueueFamilyProperties[idx] = (VkQueueFamilyProperties){
                .queueFlags = VK_QUEUE_VIDEO_DECODE_BIT_KHR,
                .queueCount = pdev->info.ip[pdev->vid_decode_ip].num_queues,
-               .timestampValidBits = 64,
+               .timestampValidBits = 0,
                .minImageTransferGranularity = (VkExtent3D){1, 1, 1},
             };
             idx++;
@@ -2323,7 +2323,7 @@ radv_get_physical_device_queue_family_properties(struct radv_physical_device *pd
             *pQueueFamilyProperties[idx] = (VkQueueFamilyProperties){
                .queueFlags = VK_QUEUE_VIDEO_ENCODE_BIT_KHR,
                .queueCount = pdev->info.ip[AMD_IP_VCN_ENC].num_queues,
-               .timestampValidBits = 64,
+               .timestampValidBits = 0,
                .minImageTransferGranularity = (VkExtent3D){1, 1, 1},
             };
             idx++;
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index d4446bb4448..ade2dd757e0 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -2648,6 +2648,9 @@ radv_CmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 sta
 
    radv_cs_add_buffer(device->ws, cs, pool->bo);
 
+   assert(cmd_buffer->qf != RADV_QUEUE_VIDEO_DEC &&
+          cmd_buffer->qf != RADV_QUEUE_VIDEO_ENC);
+
    if (cmd_buffer->qf == RADV_QUEUE_TRANSFER) {
       if (instance->drirc.flush_before_timestamp_write) {
          radeon_check_space(device->ws, cmd_buffer->cs, 1);