diff --git a/app/indexers/concerns/hyrax/location_indexer.rb b/app/indexers/concerns/hyrax/location_indexer.rb
index 7f6fbcf55d..ba5f286e2b 100644
--- a/app/indexers/concerns/hyrax/location_indexer.rb
+++ b/app/indexers/concerns/hyrax/location_indexer.rb
@@ -6,7 +6,7 @@ module Hyrax
   module LocationIndexer
     def to_solr
       super.tap do |index_document|
-        index_document[:based_near_label_tesim] = based_near_label_lookup(resource.based_near) if resource.respond_to? :based_near
+        index_document[:based_near_label_tesim] = index_document[:based_near_label_tesim] = based_near_label_lookup(resource.based_near) if resource.respond_to? :based_near
       end
     end
 
@@ -14,7 +14,7 @@ def to_solr
 
     def based_near_label_lookup(locations)
       locations.map do |loc|
-        location_service.full_label(loc)
+        location_service.full_label(loc) if loc.present?
       end
     end