diff --git a/src/SizeMeApp.jsx b/src/SizeMeApp.jsx
index c77a2a6..96d459c 100644
--- a/src/SizeMeApp.jsx
+++ b/src/SizeMeApp.jsx
@@ -121,8 +121,6 @@ SizeMeApp.propTypes = {
 
 const mapStateToProps = state => ({
     resolved: state.authToken.resolved && state.productInfo.resolved,
-    loggedIn: state.authToken.loggedIn,
-    sizemeProductPage: state.productInfo.product !== null,
     selectedSize: state.selectedSize,
     matchResult: state.match.matchResult,
     measurementInputs: Optional.ofNullable(state.productInfo.product).flatMap(p => Optional.ofNullable(p.model))
diff --git a/src/index.js b/src/index.js
index 2daf8f5..8fb0100 100644
--- a/src/index.js
+++ b/src/index.js
@@ -41,7 +41,9 @@ const { addToCartElement, addToCartEvent } = uiOptions;
 if (addToCartElement && addToCartEvent) {
     const elements = document.querySelectorAll(addToCartElement);
     const fn = () => {
-        const { loggedIn, sizemeProductPage } = sizemeStore.getState();
+        const { authToken, productInfo } = sizemeStore.getState();
+        const loggedIn = authToken.loggedIn;
+        const sizemeProductPage = productInfo.product !== null;
         if (loggedIn && sizemeProductPage) {
             trackEvent("addToCartSM", "Store: Product added to cart by SizeMe user");
         } else if (loggedIn && !sizemeProductPage) {