diff --git a/assets/javascripts/discourse/connectors/topic-list-after-title/topic-list-after-title.hbr b/assets/javascripts/discourse/connectors/topic-list-after-title/topic-list-after-title.hbr
index 7e3f785a..aa143aba 100644
--- a/assets/javascripts/discourse/connectors/topic-list-after-title/topic-list-after-title.hbr
+++ b/assets/javascripts/discourse/connectors/topic-list-after-title/topic-list-after-title.hbr
@@ -1,3 +1,5 @@
+{{#if context.topic.location}}
 <span class="location-after-title">
   {{~location-format context.topic.location}}
-</span>
\ No newline at end of file
+</span>
+{{/if}}
diff --git a/plugin.rb b/plugin.rb
index 590da87a..16bfee82 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,6 +1,6 @@
 # name: discourse-locations
 # about: Tools for handling locations in Discourse
-# version: 6.2.10
+# version: 6.2.11
 # authors: Angus McLeod, Robert Barrow
 # contact_emails: development@pavilion.tech
 # url: https://github.com/angusmcleod/discourse-locations
diff --git a/test/javascripts/acceptance/topic-list-test.js b/test/javascripts/acceptance/topic-list-test.js
index 0a64b222..25c7a763 100644
--- a/test/javascripts/acceptance/topic-list-test.js
+++ b/test/javascripts/acceptance/topic-list-test.js
@@ -22,9 +22,16 @@ acceptance("Topic List- Show Correct Topic Location Format", function (needs) {
 
   test("topic on topic list location - shows correct format", async function (assert) {
     await visit("/latest");
-    assert.equal(
-      query('tr[data-topic-id="36"] span.location-after-title').innerText,
+    assert.ok(
+      exists('tr[data-topic-id="36"] span.location-after-title'),
       "Pompidou, Paris, France"
     );
   });
+  test("topic on topic list location - doesn't include location after title span when there is no location", async function (assert) {
+    await visit("/latest");
+    assert.equal(
+      query('tr[data-topic-id="35"] span.location-after-title'),
+      null
+    )
+  });
 });