diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 59c33ea7b6..f5212d6312 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -97,11 +97,13 @@
             </a></td>
         </tr>
         {% endif %}
+        {% if part.units %}
         <tr>
             <td></td>
             <td><b>{% trans "Units" %}</b></td>
             <td>{{ part.units }}</td>
         </tr>
+        {% endif %}
         {% if part.minimum_stock > 0 %}
         <tr>
             <td><span class='fas fa-greater-than-equal'></span></td>
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index f35d616a91..eb347fc29e 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -119,7 +119,7 @@
             <td>
                 <h4>{% trans "Available Stock" %}</h4>
             </td>
-            <td><h4>{% decimal part.available_stock %} {{ part.units }}</h4></td>
+            <td><h4>{% decimal part.available_stock %}{% if part.units %} {{ part.units }}{% endif %}</h4></td>
         </tr>
         <tr>
             <td><span class='fas fa-map-marker-alt'></span></td>