diff --git a/neo/sys/DeviceManager_VK.cpp b/neo/sys/DeviceManager_VK.cpp
index ef29c899..f13eabb0 100644
--- a/neo/sys/DeviceManager_VK.cpp
+++ b/neo/sys/DeviceManager_VK.cpp
@@ -1218,6 +1218,8 @@ void DeviceManager_VK::DestroyDeviceAndSwapChain()
 {
 	OPTICK_SHUTDOWN();
 
+	m_VulkanDevice.waitIdle();
+
 	m_FrameWaitQuery = nullptr;
 
 	for( int i = 0; i < m_SwapChainImages.size(); i++ )