diff --git a/src/components/AppLayout/AppChannelContext.tsx b/src/components/AppLayout/AppChannelContext.tsx
index d35d3ee6b..04179eeb4 100644
--- a/src/components/AppLayout/AppChannelContext.tsx
+++ b/src/components/AppLayout/AppChannelContext.tsx
@@ -35,10 +35,10 @@ const isValidChannel = (channelId: string, channelList?: ChannelFragment[]) => {
 
 export const AppChannelProvider: React.FC = ({ children }) => {
   const { setChannel } = useSaleorConfig();
-  const { authenticated } = useUser();
+  const { authenticated, user } = useUser();
   const [selectedChannel, setSelectedChannel] = useLocalStorage("channel", "");
   const { data: channelData, refetch } = useBaseChannelsQuery({
-    skip: !authenticated,
+    skip: !authenticated || !user,
   });
 
   const [isPickerActive, setPickerActive] = React.useState(false);
diff --git a/src/components/Shop/index.tsx b/src/components/Shop/index.tsx
index 063439dba..6b7fb613a 100644
--- a/src/components/Shop/index.tsx
+++ b/src/components/Shop/index.tsx
@@ -12,9 +12,9 @@ type ShopContext = ShopInfoQuery["shop"];
 export const ShopContext = React.createContext<ShopContext>(undefined);
 
 export const ShopProvider: React.FC = ({ children }) => {
-  const { authenticated } = useUser();
+  const { authenticated, user } = useUser();
   const { data } = useShopInfoQuery({
-    skip: !authenticated,
+    skip: !authenticated || !user,
   });
 
   return (