diff --git a/app/services/database_views.rb b/app/services/database_views.rb
index f26b740..9c2db6b 100644
--- a/app/services/database_views.rb
+++ b/app/services/database_views.rb
@@ -20,7 +20,12 @@ def self.activate_callback(then_refresh: false)
 
   def self.run_without_callback(then_refresh: false, &block)
     deactivate_callback
-    yield
-    activate_callback(then_refresh: then_refresh)
+    completed = false
+    begin
+      yield
+      completed = true
+    ensure
+      activate_callback(then_refresh: completed && then_refresh)
+    end
   end
 end