diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d92c6966..07aad999d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,8 @@ And it also includes fixes for all reported issues so far
     - faster json parsing  
     - faster lora indexing  
     - lazy load optional imports  
+    - batch embedding load, thanks @midcoastal  
+      10x+ faster embeddings load for large number of embeddings, now works for 1000+ embeddings  
   - **extra networks**  
     - 4x faster civitai metadata and previews lookup  
     - better display and selection of tags & trigger words  
diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index 8870e3568..ba05e1ea2 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit 8870e35682f1df50fed2956e00839507ac739dd7
+Subproject commit ba05e1ea20df0e29a3dce9fcbe3ecc30777a5271
diff --git a/modules/prompt_parser_diffusers.py b/modules/prompt_parser_diffusers.py
index d30f95fb7..12f275631 100644
--- a/modules/prompt_parser_diffusers.py
+++ b/modules/prompt_parser_diffusers.py
@@ -137,7 +137,7 @@ def prepare_embedding_providers(pipe, clip_skip):
         provider = EmbeddingsProvider(tokenizer=pipe.tokenizer, text_encoder=pipe.text_encoder, truncate=False,
                                       returned_embeddings_type=embedding_type, device=device)
         embeddings_providers.append(provider)
-    if hasattr(pipe, "tokenizer_2") and getattr(pipe, "text_encoder_2"):
+    if hasattr(pipe, "tokenizer_2") and hasattr(pipe, "text_encoder_2"):
         provider = EmbeddingsProvider(tokenizer=pipe.tokenizer_2, text_encoder=pipe.text_encoder_2, truncate=False,
                                       returned_embeddings_type=embedding_type, device=device)
         embeddings_providers.append(provider)
diff --git a/scripts/photomaker_model.py b/scripts/photomaker_model.py
index 0e1ce34bc..25bbbe353 100755
--- a/scripts/photomaker_model.py
+++ b/scripts/photomaker_model.py
@@ -221,12 +221,14 @@ class PhotoMakerStableDiffusionXLPipeline(StableDiffusionXLPipeline):
     ):
         device = device or self._execution_device
 
+        """
         if prompt is not None and isinstance(prompt, str):
             batch_size = 1
         elif prompt is not None and isinstance(prompt, list):
             batch_size = len(prompt)
         else:
             batch_size = prompt_embeds.shape[0]
+        """
 
         # Find the token id of the trigger word
         image_token_id = self.tokenizer_2.convert_tokens_to_ids(self.trigger_word)