diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index 447b65075..ab7ed7728 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -232,7 +232,7 @@ def continue_run
       def render_run
         @checks = @query ? @query.checks.order(:id) : []
 
-        @annotations = Blazer::Annotations.new(@data_source.annotations).call(@result)
+        @annotations = Blazer.annotations.new(@data_source.annotations).call(@result)
 
         @first_row = @rows.first || []
         @column_types = []
diff --git a/lib/blazer.rb b/lib/blazer.rb
index a30cb6e4f..c4a26c52e 100644
--- a/lib/blazer.rb
+++ b/lib/blazer.rb
@@ -83,6 +83,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 :("