diff --git a/lib/tool_shed/repository_registry.py b/lib/tool_shed/repository_registry.py
index 6927b4e68e74..521ae1a06c6f 100644
--- a/lib/tool_shed/repository_registry.py
+++ b/lib/tool_shed/repository_registry.py
@@ -44,8 +44,12 @@ def __init__(self, app):
         self.viewable_suites_by_category = {}
         self.viewable_valid_repositories_and_suites_by_category = {}
         self.viewable_valid_suites_by_category = {}
-        self.load_viewable_repositories_and_suites_by_category()
-        self.load_repository_and_suite_tuples()
+        self.load()
+
+    def load(self):
+        with self.sa_session.begin():
+            self.load_viewable_repositories_and_suites_by_category()
+            self.load_repository_and_suite_tuples()
 
     def add_category_entry(self, category):
         category_name = str(category.name)