diff --git a/toolium/utils/ai_utils/accuracy.py b/toolium/utils/ai_utils/accuracy.py
index f9808f30..12d345ea 100644
--- a/toolium/utils/ai_utils/accuracy.py
+++ b/toolium/utils/ai_utils/accuracy.py
@@ -167,12 +167,11 @@ def scenario_run_with_accuracy(context, scenario_run, scenario, *args, **kwargs)
                 scenario.set_status(Status.failed)
                 scenario.exception = AssertionError(final_message)
 
+            after_accuracy_scenario(context, scenario)
+
         # Clean accuracy execution data from context
         context.storage.pop('accuracy_execution_data', None)
         context.storage.pop('accuracy_execution_index', None)
-
-        after_accuracy_scenario(context, scenario)
-
         return run_response
 
     scenario_run = scenario.run