diff --git a/base/VulkanRaytracingSample.cpp b/base/VulkanRaytracingSample.cpp
index f645ed1a..5628cea8 100644
--- a/base/VulkanRaytracingSample.cpp
+++ b/base/VulkanRaytracingSample.cpp
@@ -8,18 +8,18 @@
 
 #include "VulkanRaytracingSample.h"
 
-void VulkanRaytracingSample::enableExtensions()
+void VulkanRaytracingSample::enableExtensions(bool rayqueryOnly)
 {
 	// Require Vulkan 1.1
 	apiVersion = VK_API_VERSION_1_1;
 
 	// Ray tracing related extensions required by this sample
 	enabledDeviceExtensions.push_back(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME);
-	enabledDeviceExtensions.push_back(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME);
+	if (!rayqueryOnly) enabledDeviceExtensions.push_back(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME);
 
 	// Required by VK_KHR_acceleration_structure
 	enabledDeviceExtensions.push_back(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME);
-	enabledDeviceExtensions.push_back(VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME);
+	if (!rayqueryOnly) enabledDeviceExtensions.push_back(VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME);
 	enabledDeviceExtensions.push_back(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME);
 
 	// Required for VK_KHR_ray_tracing_pipeline
diff --git a/base/VulkanRaytracingSample.h b/base/VulkanRaytracingSample.h
index cc4dedf7..e32f8adf 100644
--- a/base/VulkanRaytracingSample.h
+++ b/base/VulkanRaytracingSample.h
@@ -67,7 +67,7 @@ public:
 		VkStridedDeviceAddressRegionKHR stridedDeviceAddressRegion{};
 	};
 
-	void enableExtensions();
+	void enableExtensions(bool rayqueryOnly = false);
 	ScratchBuffer createScratchBuffer(VkDeviceSize size);
 	void deleteScratchBuffer(ScratchBuffer& scratchBuffer);
 	void createAccelerationStructure(AccelerationStructure& accelerationStructure, VkAccelerationStructureTypeKHR type, VkAccelerationStructureBuildSizesInfoKHR buildSizeInfo);
diff --git a/examples/rayquery/rayquery.cpp b/examples/rayquery/rayquery.cpp
index 96b8c1c1..dec0c9df 100644
--- a/examples/rayquery/rayquery.cpp
+++ b/examples/rayquery/rayquery.cpp
@@ -47,7 +47,7 @@ public:
 		camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
 		camera.setTranslation(glm::vec3(0.0f, 3.0f, -10.0f));
 		settings.overlay = true;
-		enableExtensions();
+		enableExtensions(true);
 		enabledDeviceExtensions.push_back(VK_KHR_RAY_QUERY_EXTENSION_NAME);
 	}