diff --git a/app/jobs/new_subscription.rb b/app/jobs/new_subscription.rb
index 1537886..efbce8b 100644
--- a/app/jobs/new_subscription.rb
+++ b/app/jobs/new_subscription.rb
@@ -35,5 +35,7 @@ def perform(connection_id, subscription_id, filters)
 
     MemStore.fanout(cid: connection_id, sid: subscription_id, command: :found_end, payload: "EOSE")
     ReqFiltersLog.create(filters: filters) if SHOULD_LOG_FILTERS
+  rescue ActiveRecord::QueryCanceled
+    MemStore.fanout(cid: connection_id, command: :notice, payload: "#{subscription_id} subscription timeout, please try to make a simpler query")
   end
 end