diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/data_stores/kkv.py b/spiffworkflow-backend/src/spiffworkflow_backend/data_stores/kkv.py
index a522d1756..4ed6712af 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/data_stores/kkv.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/data_stores/kkv.py
@@ -71,7 +71,7 @@ class KKVDataStore(BpmnDataStoreSpecification, DataStoreCRUD):  # type: ignore
     def get(self, my_task: SpiffTask) -> None:
         """get."""
 
-        def getter(top_level_key: str, secondary_key: str) -> Any | None:
+        def getter(top_level_key: str, secondary_key: str | None) -> Any | None:
             location = self.data_store_location_for_task(KKVDataStoreModel, my_task, self.bpmn_id)
             store_model: KKVDataStoreModel | None = None
 
@@ -81,15 +81,26 @@ class KKVDataStore(BpmnDataStoreSpecification, DataStoreCRUD):  # type: ignore
             if store_model is None:
                 raise DataStoreReadError(f"Unable to locate kkv data store '{self.bpmn_id}'.")
 
-            model = (
+            if secondary_key is not None:
+                model = (
+                    db.session.query(KKVDataStoreEntryModel)
+                    .filter_by(kkv_data_store_id=store_model.id, top_level_key=top_level_key, secondary_key=secondary_key)
+                    .first()
+                )
+
+                if model is not None:
+                    return model.value
+                return None
+
+            models = (
                 db.session.query(KKVDataStoreEntryModel)
-                .filter_by(kkv_data_store_id=store_model.id, top_level_key=top_level_key, secondary_key=secondary_key)
-                .first()
+                .filter_by(kkv_data_store_id=store_model.id, top_level_key=top_level_key)
+                .all()
             )
 
-            if model is not None:
-                return model.value
-            return None
+            values = {model.secondary_key: model.value for model in models}
+
+            return values
 
         my_task.data[self.bpmn_id] = getter