diff --git a/src/engine/renderer/vulkan/renderer_vulkan.cc b/src/engine/renderer/vulkan/renderer_vulkan.cc
index 6d2bdfb..ae7862b 100644
--- a/src/engine/renderer/vulkan/renderer_vulkan.cc
+++ b/src/engine/renderer/vulkan/renderer_vulkan.cc
@@ -1294,6 +1294,8 @@ bool RendererVulkan::AllocateStagingBuffer(uint32_t amount,
                                            uint32_t segment,
                                            uint32_t& alloc_offset,
                                            uint32_t& alloc_size) {
+  DCHECK(std::this_thread::get_id() == setup_thread_.get_id());
+
   alloc_size = amount;
 
   while (true) {
diff --git a/src/engine/renderer/vulkan/renderer_vulkan.h b/src/engine/renderer/vulkan/renderer_vulkan.h
index efd2ef4..fe9f227 100644
--- a/src/engine/renderer/vulkan/renderer_vulkan.h
+++ b/src/engine/renderer/vulkan/renderer_vulkan.h
@@ -202,7 +202,7 @@ class RendererVulkan final : public Renderer {
 
   std::thread setup_thread_;
   base::TaskRunner task_runner_;
-  std::counting_semaphore<> semaphore_{0};
+  std::binary_semaphore semaphore_{0};
   std::atomic<bool> quit_{false};
 
   bool InitializeInternal();