diff --git a/netbox/templates/extras/imageattachment.html b/netbox/templates/extras/imageattachment.html
index 4f267cf23..8aefd095b 100644
--- a/netbox/templates/extras/imageattachment.html
+++ b/netbox/templates/extras/imageattachment.html
@@ -56,13 +56,8 @@
       <div class="card">
         <h2 class="card-header">{% trans "Image" %}</h2>
         <div class="card-body">
-          <a href="{{ object.image.url }}" title="{{ object.description }}">
-            <img
-              src="{{ object.image.url }}"
-              height="{{ image.height }}"
-              width="{{ image.width }}"
-              alt="{{ object.name }}"
-            />
+          <a href="{{ object.image.url }}" title="{{ object.name }}">
+            {{ object.html_tag }}
           </a>
         </div>
       </div>
diff --git a/netbox/templates/extras/object_imageattachments.html b/netbox/templates/extras/object_imageattachments.html
index 46cb7ff99..70caaf041 100644
--- a/netbox/templates/extras/object_imageattachments.html
+++ b/netbox/templates/extras/object_imageattachments.html
@@ -1,35 +1,46 @@
 {% extends base_template %}
+{% load helpers %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 {% load thumbnail %}
 
 {% block extra_controls %}
   {% if perms.extras.add_imageattachment %}
-    <a href="{% url 'extras:imageattachment_add' %}?object_type={{ object|content_type_id }}&object_id={{ object.pk }}" class="btn btn-primary">
-      <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Attach an Image" %}
-    </a>
+    {% with viewname=object|viewname:"image-attachments" %}
+      <a href="{% url 'extras:imageattachment_add' %}?object_type={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={% url viewname pk=object.pk %}" class="btn btn-primary">
+        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Attach an Image" %}
+      </a>
+    {% endwith %}
   {% endif %}
 {% endblock %}
 
 {% block content %}
-  <div class="d-flex flex-wrap">
-    {% for object in image_attachments %}
-      <div class="thumbnail m-2">
-        {% thumbnail object.image "200x200" crop="center" as tn %}
-          <a href="{{ object.get_absolute_url }}" class="d-block" title="{{ object.description }}">
-            <img
-              src="{{ tn.url }}"
-              width="{{ tn.width }}"
-              height="{{ tn.height }}"
-              class="rounded"
-              alt="{{ object.name }}"
-            />
-          </a>
-        {% endthumbnail %}
-        <div class="text-center text-secondary text-truncate fs-5">
-          {{ object }}
+  {% if image_attachments %}
+    <div class="d-flex flex-wrap">
+      {% for object in image_attachments %}
+        <div class="thumbnail m-2">
+          {% thumbnail object.image "200x200" crop="center" as tn %}
+            <a href="{{ object.get_absolute_url }}" class="d-block" title="{{ object.name }}">
+              <img
+                src="{{ tn.url }}"
+                width="{{ tn.width }}"
+                height="{{ tn.height }}"
+                class="rounded"
+                alt="{{ object.description or object.name }}"
+              />
+            </a>
+          {% endthumbnail %}
+          <div class="text-center text-secondary text-truncate fs-5">
+            {{ object }}
+          </div>
         </div>
-      </div>
-    {% endfor %}
-  </div>
+      {% endfor %}
+    </div>
+  {% else %}
+    <div class="alert alert-info">
+      {% blocktrans with object_type=object|meta:"verbose_name" %}
+        No images have been attached to this {{ object_type }}.
+      {% endblocktrans %}
+    </div>
+  {% endif %}
 {% endblock %}