diff --git a/lib/galaxy/webapps/base/webapp.py b/lib/galaxy/webapps/base/webapp.py
index 7358fdb393f4..effc7a489131 100644
--- a/lib/galaxy/webapps/base/webapp.py
+++ b/lib/galaxy/webapps/base/webapp.py
@@ -650,7 +650,8 @@ def _ensure_valid_session(self, session_cookie: str, create: bool = True) -> Non
             galaxy_session = self.__create_new_session(prev_galaxy_session, user_for_new_session)
             galaxy_session_requires_flush = True
             self.galaxy_session = galaxy_session
-            self.get_or_create_default_history()
+            if self.webapp.name == "galaxy":
+                self.get_or_create_default_history()
             self.__update_session_cookie(name=session_cookie)
         else:
             self.galaxy_session = galaxy_session
diff --git a/lib/tool_shed/webapp/buildapp.py b/lib/tool_shed/webapp/buildapp.py
index e25859c33be6..05388285ea2b 100644
--- a/lib/tool_shed/webapp/buildapp.py
+++ b/lib/tool_shed/webapp/buildapp.py
@@ -36,6 +36,10 @@ class ToolShedGalaxyWebTransaction(GalaxyWebTransaction):
     def repositories_hostname(self) -> str:
         return url_for("/", qualified=True).rstrip("/")
 
+    def get_or_create_default_history(self):
+        # tool shed has no concept of histories
+        raise NotImplementedError
+
 
 class CommunityWebApplication(galaxy.webapps.base.webapp.WebApplication):
     injection_aware: bool = True