diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info
index 8347deba3..e64f2ea7c 160000
--- a/extensions-builtin/sd-extension-system-info
+++ b/extensions-builtin/sd-extension-system-info
@@ -1 +1 @@
-Subproject commit 8347deba3d9df7b6dd2bafc492ac465e5dd81e98
+Subproject commit e64f2ea7c7ec1a24f8910f915b2257b86121f6b8
diff --git a/modules/ui_common.py b/modules/ui_common.py
index 7b8e38bab..2c7287b57 100644
--- a/modules/ui_common.py
+++ b/modules/ui_common.py
@@ -99,7 +99,7 @@ def save_files(js_data, images, html_info, do_make_zip, index):
             p.all_seeds.append(p.seed)
         while len(p.all_prompts) <= i:
             p.all_prompts.append(p.prompt)
-        while len(p.infotexts) <= i:
+        while len(p.infotexts) <= i + 1:
             p.infotexts.append(p.infotext)
         if 'name' in filedata and ('tmp' not in filedata['name']) and os.path.isfile(filedata['name']):
             fullfn = filedata['name']
@@ -115,7 +115,8 @@ def save_files(js_data, images, html_info, do_make_zip, index):
             shared.log.info(f"Copying image: {fullfn} -> {destination}")
         else:
             image = image_from_url_text(filedata)
-            fullfn, txt_fullfn = modules.images.save_image(image, shared.opts.outdir_save, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], info=p.infotexts[i], extension=shared.opts.samples_format, grid=is_grid, p=p, save_to_dirs=shared.opts.use_save_to_dirs_for_ui)
+            # infotext is offset by 1 because the first image is the grid
+            fullfn, txt_fullfn = modules.images.save_image(image, shared.opts.outdir_save, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], info=p.infotexts[i + 1], extension=shared.opts.samples_format, grid=is_grid, p=p, save_to_dirs=shared.opts.use_save_to_dirs_for_ui)
             if fullfn is None:
                 continue
             filename = os.path.relpath(fullfn, shared.opts.outdir_save)