diff --git a/src/components/NavigationMobile/NavigationMobile.js b/src/components/NavigationMobile/NavigationMobile.js
index f242f96a13..7e34b57c91 100644
--- a/src/components/NavigationMobile/NavigationMobile.js
+++ b/src/components/NavigationMobile/NavigationMobile.js
@@ -12,7 +12,6 @@ import Toolbar from "@material-ui/core/Toolbar";
 import Typography from "@material-ui/core/Typography";
 import CloseIcon from "mdi-material-ui/Close";
 import Link from "components/Link";
-import withShop from "containers/shop/withShop";
 import NavigationItemMobile from "./NavigationItemMobile";
 import NavigationSubMenuMobile from "./NavigationSubMenuMobile";
 
@@ -135,4 +134,4 @@ class NavigationMobile extends Component {
   }
 }
 
-export default withStyles(styles)(withShop(inject("navItems", "uiStore")(observer(NavigationMobile))));
\ No newline at end of file
+export default withStyles(styles)(inject("navItems", "uiStore")(observer(NavigationMobile)));
\ No newline at end of file
diff --git a/src/containers/cart/withCart.js b/src/containers/cart/withCart.js
index da86be4916..86c32e837a 100644
--- a/src/containers/cart/withCart.js
+++ b/src/containers/cart/withCart.js
@@ -1,10 +1,9 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { Mutation, Query, withApollo } from "react-apollo";
+import { Mutation, Query } from "@apollo/react-components";
 import { inject, observer } from "mobx-react";
 import hoistNonReactStatic from "hoist-non-react-statics";
 import cartItemsConnectionToArray from "lib/utils/cartItemsConnectionToArray";
-import withShop from "containers/shop/withShop";
 import {
   createCartMutation,
   addCartItemsMutation,
@@ -492,5 +491,5 @@ export default function withCart(Component) {
 
   hoistNonReactStatic(WithCart, Component);
 
-  return withApollo(withShop(inject("cartStore", "authStore")(observer(WithCart))));
+  return inject("cartStore", "authStore")(observer(WithCart));
 }
diff --git a/src/containers/shop/shop.gql b/src/containers/shop/shop.gql
deleted file mode 100644
index 4a1b2520d9..0000000000
--- a/src/containers/shop/shop.gql
+++ /dev/null
@@ -1,10 +0,0 @@
-query shopQuery($shopId: ID!) {
-  shop(id: $shopId) {
-    _id
-    description
-    name
-    currency {
-      code
-    }
-  }
-}