diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index bc187588d0..56ef8a3370 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -144,11 +144,15 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <td>{% trans "Build Order" %}</td>
         <td><a href="{% url 'build-detail' item.build_order.id %}">{{ item.build_order }}</a></td>
     </tr>
-    {% elif item.location %}
+    {% else %}
     <tr>
         <td><span class='fas fa-map-marker-alt'></span></td>
         <td>{% trans "Location" %}</td>
+        {% if item.location %}
         <td><a href="{% url 'stock-location-detail' item.location.id %}">{{ item.location.name }}</a></td>
+        {% else %}
+        <td>{% trans "No location set" %}</td>
+        {% endif %}
     </tr>
     {% endif %}
     {% if item.uid %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 478776c421..f92539cab8 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -189,9 +189,7 @@
     $('#item-create').click(function () {
         launchModalForm("{% url 'stock-item-create' %}",
                         {
-                            success: function() {
-                                $("#stock-table").bootstrapTable('refresh');
-                            },
+                            follow: true,
                             data: {
                                 {% if location %}
                                 location: {{ location.id }}