diff --git a/src/Vulkan/Debug/Server.cpp b/src/Vulkan/Debug/Server.cpp
index d6e17b6..d283aa9 100644
--- a/src/Vulkan/Debug/Server.cpp
+++ b/src/Vulkan/Debug/Server.cpp
@@ -468,13 +468,18 @@
 		return dap::ConfigurationDoneResponse();
 	});
 
-	printf("Waiting for debugger connection...\n");
 	server->start(port, [&](const std::shared_ptr<dap::ReaderWriter> &rw) {
 		session->bind(rw);
 		ctx->addListener(this);
 	});
-	configurationDone.wait();
-	printf("Debugger connection established\n");
+
+	static bool waitForDebugger = getenv("VK_WAIT_FOR_DEBUGGER") != nullptr;
+	if(waitForDebugger)
+	{
+		printf("Waiting for debugger connection...\n");
+		configurationDone.wait();
+		printf("Debugger connection established\n");
+	}
 }
 
 Server::Impl::~Impl()