diff --git a/yahoo_panoptes/enrichment/enrichment_plugin_scheduler.py b/yahoo_panoptes/enrichment/enrichment_plugin_scheduler.py
index d468b254..cc33c95d 100644
--- a/yahoo_panoptes/enrichment/enrichment_plugin_scheduler.py
+++ b/yahoo_panoptes/enrichment/enrichment_plugin_scheduler.py
@@ -246,6 +246,7 @@ def celery_beat_service_started(sender=None, args=None, **kwargs):
     """
     global enrichment_plugin_scheduler
     sender.scheduler.panoptes_context = panoptes_context
+    sender.scheduler.metadata_kv_store_class = PanoptesEnrichmentPluginAgentKeyValueStore
     sender.scheduler.task_prefix = const.ENRICHMENT_PLUGIN_SCHEDULER_CELERY_TASK_PREFIX
     enrichment_plugin_scheduler.run(sender, args, **kwargs)