diff --git a/src/imgui/renderer/texture_manager.cpp b/src/imgui/renderer/texture_manager.cpp
index ba4a05d01..7f9c69d49 100644
--- a/src/imgui/renderer/texture_manager.cpp
+++ b/src/imgui/renderer/texture_manager.cpp
@@ -7,6 +7,7 @@
 #include <externals/stb_image.h>
 
 #include "common/assert.h"
+#include "common/config.h"
 #include "common/io_file.h"
 #include "common/polyfill_thread.h"
 #include "imgui_impl_vulkan.h"
@@ -147,6 +148,11 @@ void WorkerLoop() {
             g_job_list.pop_front();
             g_job_list_mtx.unlock();
 
+            if (Config::vkCrashDiagnosticEnabled()) {
+                // FIXME: Crash diagnostic hangs when building the command buffer here
+                continue;
+            }
+
             if (!path.empty()) { // Decode PNG from file
                 Common::FS::IOFile file(path, Common::FS::FileAccessMode::Read);
                 if (!file.IsOpen()) {