use subgrid

assets/sass/_theme/blocks/gallery.sass

@@ -17,8 +17,6 @@
         figcaption
             @include small
             position: relative
-            &:not(:empty)
-                margin-top: $spacing0
             p
                 margin-bottom: 0
         .credit
@@ -42,6 +40,9 @@
                 grid-gap: half($grid-gutter-sm) !important
             &--with-text
                 figure
+                    display: grid
+                    grid-template-columns: subgrid
+                    gap: space(3)
                     figcaption
                         &::after
                             content: ' '

layouts/partials/blocks/templates/gallery/grid.html

@@ -33,11 +33,11 @@
           {{ if not site.Params.image_sizes.design_system.lightbox.disabled }}
             </a>
           {{ end }}
+          {{ if .text }}
             <figcaption>
-              {{ if .text }}
-                {{- partial "PrepareHTML" .text -}}
-              {{ end }}
+              {{- partial "PrepareHTML" .text -}}
             </figcaption>
+          {{ end }}
         </figure>
       {{- end -}}
     {{ end }}