diff --git a/app/views/spree/admin/images/edit.html.haml b/app/views/spree/admin/images/edit.html.haml
index 711dd32fbb..40ff067b0a 100644
--- a/app/views/spree/admin/images/edit.html.haml
+++ b/app/views/spree/admin/images/edit.html.haml
@@ -11,9 +11,7 @@
     .field.alpha.three.columns.align-center
       = f.label t('spree.thumbnail')
       %br/
-      - # A Rails bug makes it necessary to call `main_app.url_for` here.
-      - # https://github.com/rails/rails/issues/31325
-      = link_to image_tag(main_app.url_for(@image.variant(:small))), main_app.url_for(@image.variant(:product))
+      = link_to image_tag(@image.url(:small)), @image.url(:product)
     .nine.columns.omega
       = render partial: 'form', locals: { f: f }
     .clear
diff --git a/app/views/spree/admin/images/index.html.haml b/app/views/spree/admin/images/index.html.haml
index 978de27092..4757f869de 100644
--- a/app/views/spree/admin/images/index.html.haml
+++ b/app/views/spree/admin/images/index.html.haml
@@ -32,9 +32,7 @@
           %td.no-border
             %span.handle
           %td
-            - # A Rails bug makes it necessary to call `main_app.url_for` here.
-            - # https://github.com/rails/rails/issues/31325
-            = link_to image_tag(main_app.url_for(image.variant(:mini))), main_app.url_for(image.variant(:product))
+            = link_to image_tag(image.url(:mini)), image.url(:product)
           %td= options_text_for(image)
           %td= image.alt
           %td.actions