diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index 45a205eb6..3efde104a 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -258,7 +258,7 @@ def render_run
       @linked_columns = @data_source.linked_columns
 
       @markers = []
-      @annotations = Blazer::Annotations.new(@data_source.annotations).call(@result)
+      @annotations = Blazer.annotations.new(@data_source.annotations).call(@result)
       @geojson = []
       set_map_data if Blazer.maps?
 
diff --git a/lib/blazer.rb b/lib/blazer.rb
index 49b1f82a7..084ad0987 100644
--- a/lib/blazer.rb
+++ b/lib/blazer.rb
@@ -84,6 +84,7 @@ class << self
   self.async = false
   self.images = false
   self.override_csp = false
+  self.annotations = Blazer::Annotations
 
   VARIABLE_MESSAGE = "Variable cannot be used in this position"
   TIMEOUT_MESSAGE = "Query timed out :("