diff --git a/CHANGELOG-restrict-lists-to-hubmap.md b/CHANGELOG-restrict-lists-to-hubmap.md
new file mode 100644
index 0000000000..2816b012fa
--- /dev/null
+++ b/CHANGELOG-restrict-lists-to-hubmap.md
@@ -0,0 +1 @@
+- Restrict "My Lists" feature to HuBMAP users only.
\ No newline at end of file
diff --git a/context/app/static/js/components/detailPage/entityHeader/EntityHeaderActionButtons/EntityHeaderActionButtons.tsx b/context/app/static/js/components/detailPage/entityHeader/EntityHeaderActionButtons/EntityHeaderActionButtons.tsx
index 7aaf2ec410..854f237b61 100644
--- a/context/app/static/js/components/detailPage/entityHeader/EntityHeaderActionButtons/EntityHeaderActionButtons.tsx
+++ b/context/app/static/js/components/detailPage/entityHeader/EntityHeaderActionButtons/EntityHeaderActionButtons.tsx
@@ -73,9 +73,9 @@ function WorkspaceSVGIcon({ color = 'primary', ...props }: SvgIconProps) {
 
 function SaveEditEntityButton({ uuid }: Pick<Entity, 'uuid'>) {
   const { savedEntities } = useSavedLists();
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
 
-  if (!isAuthenticated) {
+  if (!isHubmapUser) {
     return null;
   }
 
diff --git a/context/app/static/js/components/detailPage/summary/SummarySaveEntityButton/SummarySaveEntityButton.tsx b/context/app/static/js/components/detailPage/summary/SummarySaveEntityButton/SummarySaveEntityButton.tsx
index c05e3e081e..b371b2ec5f 100644
--- a/context/app/static/js/components/detailPage/summary/SummarySaveEntityButton/SummarySaveEntityButton.tsx
+++ b/context/app/static/js/components/detailPage/summary/SummarySaveEntityButton/SummarySaveEntityButton.tsx
@@ -37,9 +37,9 @@ function EditSavedEntityButton({ uuid }: Pick<Entity, 'uuid'>) {
 
 export default function SummarySaveEntityButton({ uuid }: Pick<Entity, 'uuid'>) {
   const { savedEntities } = useSavedLists();
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
 
-  if (!isAuthenticated) {
+  if (!isHubmapUser) {
     return null;
   }
 
diff --git a/context/app/static/js/components/savedLists/NoItemsSaved/NoItemsSaved.tsx b/context/app/static/js/components/savedLists/NoItemsSaved/NoItemsSaved.tsx
index c1993fa444..bee6761c6b 100644
--- a/context/app/static/js/components/savedLists/NoItemsSaved/NoItemsSaved.tsx
+++ b/context/app/static/js/components/savedLists/NoItemsSaved/NoItemsSaved.tsx
@@ -38,9 +38,9 @@ function SearchPagesPrompt({ capitalize }: { capitalize?: boolean }) {
 }
 
 function LoginPrompt({ endingText }: { endingText: string }) {
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
 
-  if (isAuthenticated) {
+  if (isHubmapUser) {
     return null;
   }
 
@@ -61,11 +61,11 @@ function SavedListMessage() {
 }
 
 function SavedListsMessage() {
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
 
   return (
     <>
-      <LoginPrompt endingText=" or " /> <SearchPagesPrompt capitalize={isAuthenticated} /> to explore data to save
+      <LoginPrompt endingText=" or " /> <SearchPagesPrompt capitalize={isHubmapUser} /> to explore data to save
     </>
   );
 }
diff --git a/context/app/static/js/components/savedLists/SaveEntitiesButton/SaveEntitiesButton.tsx b/context/app/static/js/components/savedLists/SaveEntitiesButton/SaveEntitiesButton.tsx
index 28585fb664..8a95f3ffc6 100644
--- a/context/app/static/js/components/savedLists/SaveEntitiesButton/SaveEntitiesButton.tsx
+++ b/context/app/static/js/components/savedLists/SaveEntitiesButton/SaveEntitiesButton.tsx
@@ -44,7 +44,7 @@ export default function SaveEntitiesButton({
   uuids: Set<string>;
   fromSelectableTable?: boolean;
 }) {
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
   const { savedEntities, handleSaveEntities } = useSavedLists();
   const {
     entity: { entity_type: page_entity_type },
@@ -70,7 +70,7 @@ export default function SaveEntitiesButton({
     });
   });
 
-  if (!isAuthenticated) {
+  if (!isHubmapUser) {
     return null;
   }
 
diff --git a/context/app/static/js/components/savedLists/SavedListsDescription/SavedListsDescription.tsx b/context/app/static/js/components/savedLists/SavedListsDescription/SavedListsDescription.tsx
index 8b7b244797..e9ce10bd3b 100644
--- a/context/app/static/js/components/savedLists/SavedListsDescription/SavedListsDescription.tsx
+++ b/context/app/static/js/components/savedLists/SavedListsDescription/SavedListsDescription.tsx
@@ -19,9 +19,9 @@ const handleTrack = () => {
 };
 
 function LocalStorageDescription() {
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
 
-  if (isAuthenticated) {
+  if (isHubmapUser) {
     return <Description>Lists saved here are stored to your profile and are accessible across devices.</Description>;
   }
 
diff --git a/context/app/static/js/components/savedLists/api.ts b/context/app/static/js/components/savedLists/api.ts
index 9218785fa5..d2ab41731f 100644
--- a/context/app/static/js/components/savedLists/api.ts
+++ b/context/app/static/js/components/savedLists/api.ts
@@ -41,8 +41,8 @@ function useUkvHeaders(): HeadersInit {
 }
 
 function useHasUkvAccess() {
-  const { isAuthenticated } = useAppContext();
-  return Boolean(isAuthenticated);
+  const { isHubmapUser } = useAppContext();
+  return Boolean(isHubmapUser);
 }
 
 function useBuildUkvSWRKey(): {
diff --git a/context/app/static/js/pages/SavedLists/SavedLists.tsx b/context/app/static/js/pages/SavedLists/SavedLists.tsx
index 1bddbd006a..5aa6c9db87 100644
--- a/context/app/static/js/pages/SavedLists/SavedLists.tsx
+++ b/context/app/static/js/pages/SavedLists/SavedLists.tsx
@@ -7,7 +7,7 @@ import { useAppContext } from 'js/components/Contexts';
 import SavedListsContent from 'js/components/savedLists/SavedListsContent';
 
 function SavedLists() {
-  const { isAuthenticated } = useAppContext();
+  const { isHubmapUser } = useAppContext();
 
   return (
     <Stack spacing={1} marginBottom={10}>
@@ -16,7 +16,7 @@ function SavedLists() {
       </Typography>
       <Stack spacing={3}>
         <SavedListsDescription />
-        {isAuthenticated && <SavedListsContent />}
+        {isHubmapUser && <SavedListsContent />}
       </Stack>
     </Stack>
   );