diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 89fc032..1ca0256 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -6066,6 +6066,11 @@ std::string VulkanHppGenerator::generateDispatchLoaderDynamicCommandAssignment(
                                                                                 CommandData const & commandData,
                                                                                 std::string const & firstArg ) const
 {
+  if (commandName == "vkGetInstanceProcAddr")
+  {
+    // Don't overwite vkGetInstanceProcAddr with NULL.
+    return "";
+  }
   std::string str = "      " + commandName + " = PFN_" + commandName + "( vkGet" +
                     ( ( firstArg == "device" ) ? "Device" : "Instance" ) + "ProcAddr( " + firstArg + ", \"" +
                     commandName + "\" ) );\n";