diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 40979a9aa..f14ba1c86 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -138,23 +138,23 @@
                             {% endif %}
                         </td>
                     </tr>
-                    {% if object.disk %}
                     <tr>
-                        <th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %} <i class='text-warning'>{% trans "(deprecated)" %}</i></th>
-                        <td>
-                            {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
-                        </td>
-                    </tr>
-                    {% endif %}
-                    <tr>
-                        <th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Virtual Disk Space" %}</th>
-                        <td>
-                            {% if object.disk_size %}
-                                {{ object.disk_size }} {% trans "GB" context "Abbreviation for gigabyte" %}
-                            {% else %}
-                                {{ ''|placeholder }}
-                            {% endif %}
-                        </td>
+                      <th scope="row">
+                        <i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}
+                      </th>
+                      <td>
+                        {% if object.disk %}
+                          {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
+                          <span class="text-warning">
+                            <i class="mdi mdi-alert" title="{% trans "This field has been deprecated and will be removed in a future release." %}"></i>
+                          </span>
+                        {% elif object.disk_size %}
+                          {{ object.disk_size }} {% trans "GB" context "Abbreviation for gigabyte" %}
+                          ({{ object.virtualdisks.count }} {% trans "disks" %})
+                        {% else %}
+                          {{ ''|placeholder }}
+                        {% endif %}
+                      </td>
                     </tr>
                 </table>
             </div>