diff --git a/src/linker/lnk_config.c b/src/linker/lnk_config.c
index ae28b190..b11430fe 100644
--- a/src/linker/lnk_config.c
+++ b/src/linker/lnk_config.c
@@ -933,6 +933,12 @@ lnk_is_section_removed(LNK_Config *config, String8 section_name)
   return is_removed;
 }
 
+internal B32
+lnk_is_dll_delay_load(LNK_Config *config, String8 dll_name)
+{
+  return hash_table_search_path_u64(config->delay_load_ht, dll_name, 0);
+}
+
 internal void
 lnk_print_build_info()
 {
@@ -1195,8 +1201,12 @@ lnk_apply_cmd_option_to_config(Arena *arena, LNK_Config *config, String8 cmd_nam
   } break;
 
   case LNK_CmdSwitch_DelayLoad: {
-    String8List delay_load_dll_list = str8_list_copy(arena, &value_strings);
-    str8_list_concat_in_place(&config->delay_load_dll_list, &delay_load_dll_list);
+    for (String8Node *name_n = value_strings.first; name_n != 0; name_n = name_n->next) {
+      if (hash_table_search_path_u64(config->delay_load_ht, name_n->string, 0)) { continue; }
+      String8 name = push_str8_copy(arena, name_n->string);
+      hash_table_push_path_u64(arena, config->delay_load_ht, name, 0);
+      str8_list_push(arena, &config->delay_load_dll_list, name);
+    }
   } break;
 
   case LNK_CmdSwitch_Dll: {
diff --git a/src/linker/lnk_config.h b/src/linker/lnk_config.h
index aa6cdba1..bc0bce05 100644
--- a/src/linker/lnk_config.h
+++ b/src/linker/lnk_config.h
@@ -390,11 +390,13 @@ typedef struct LNK_Config
   String8                     temp_pdb_name;
   String8                     temp_rad_debug_name;
   String8                     temp_rad_chunk_map_name;
+  String8                     delay_load_helper_name;
   String8List                 remove_sections;
   LNK_IO_Flags                io_flags;
   HashTable                  *export_ht;
   HashTable                  *alt_name_ht;
   HashTable                  *include_symbol_ht;
+  HashTable                  *delay_load_ht;
 } LNK_Config;
 
 // --- MSVC Error Codes --------------------------------------------------------
@@ -579,8 +581,8 @@ internal Version lnk_get_min_subsystem_version(PE_WindowsSubsystem subsystem, CO
 
 internal B32 lnk_do_debug_info        (LNK_Config *config);
 internal B32 lnk_is_thread_pool_shared(LNK_Config *config);
-
-internal B32 lnk_is_section_removed(LNK_Config *config, String8 section_name);
+internal B32 lnk_is_section_removed   (LNK_Config *config, String8 section_name);
+internal B32 lnk_is_dll_delay_load    (LNK_Config *config, String8 dll_name);
 
 // --- Config ------------------------------------------------------------------