diff --git a/src/components/productView/__tests__/__snapshots__/productView.test.js.snap b/src/components/productView/__tests__/__snapshots__/productView.test.js.snap
index ee43e6b53..951d7437d 100644
--- a/src/components/productView/__tests__/__snapshots__/productView.test.js.snap
+++ b/src/components/productView/__tests__/__snapshots__/productView.test.js.snap
@@ -14,6 +14,7 @@ exports[`ProductView Component should render a non-connected component: non-conn
   >
     <Connect(BannerMessages)
       productId="lorem ipsum"
+      query={Object {}}
       viewId="dolor sit"
     />
   </PageMessages>
diff --git a/src/components/productView/productView.js b/src/components/productView/productView.js
index d34cc1d4b..c22076bfe 100644
--- a/src/components/productView/productView.js
+++ b/src/components/productView/productView.js
@@ -57,10 +57,11 @@ const ProductView = ({ productConfig, routeDetail, t }) => {
   } = productConfig;
 
   const {
+    query: initialQuery,
     graphTallyQuery: initialGraphTallyQuery,
     inventoryHostsQuery: initialInventoryHostsQuery,
     inventorySubscriptionsQuery: initialInventorySubscriptionsQuery,
-    toolbarQuery
+    toolbarQuery: initialToolbarQuery
   } = apiQueries.parseRhsmQuery(query, { graphTallyQuery, inventoryHostsQuery, inventorySubscriptionsQuery });
 
   const { pathParameter: productId, productParameter: productLabel, viewParameter: viewId } = routeDetail;
@@ -75,13 +76,13 @@ const ProductView = ({ productConfig, routeDetail, t }) => {
         {t(`curiosity-view.title`, { appName: helpers.UI_DISPLAY_NAME, context: productLabel })}
       </PageHeader>
       <PageMessages>
-        <BannerMessages productId={productId} viewId={viewId} query={query} />
+        <BannerMessages productId={productId} viewId={viewId} query={initialQuery} />
       </PageMessages>
       <PageToolbar>
         <ConnectedToolbar
           filterOptions={initialToolbarFilters}
           productId={productId}
-          query={toolbarQuery}
+          query={initialToolbarQuery}
           viewId={viewId}
         />
       </PageToolbar>
diff --git a/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap b/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap
index e877bc1f4..61481ee1c 100644
--- a/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap
+++ b/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap
@@ -4,8 +4,8 @@ exports[`AppMessagesSelectors should map a fulfilled product ID response to an a
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": true,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
@@ -13,8 +13,8 @@ exports[`AppMessagesSelectors should pass minimal data on a product ID without a
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": false,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
@@ -22,8 +22,8 @@ exports[`AppMessagesSelectors should pass minimal data on missing a reducer resp
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": false,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
@@ -31,8 +31,8 @@ exports[`AppMessagesSelectors should populate data from the in memory cache: cac
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": true,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
@@ -40,8 +40,8 @@ exports[`AppMessagesSelectors should populate data from the in memory cache: cac
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": true,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
@@ -49,8 +49,8 @@ exports[`AppMessagesSelectors should populate data from the in memory cache: cac
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": true,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
@@ -58,8 +58,8 @@ exports[`AppMessagesSelectors should populate data on a product ID when the api
 Object {
   "appMessages": Object {
     "cloudigradeMismatch": false,
-    "query": Object {},
   },
+  "query": Object {},
 }
 `;
 
diff --git a/src/redux/selectors/appMessagesSelectors.js b/src/redux/selectors/appMessagesSelectors.js
index 9c4cc40f2..c556976c3 100644
--- a/src/redux/selectors/appMessagesSelectors.js
+++ b/src/redux/selectors/appMessagesSelectors.js
@@ -44,8 +44,7 @@ const queryFilter = (state, props = {}) => ({
 const selector = createSelector([statePropsFilter, queryFilter], (data, query = {}) => {
   const { viewId = null, productId = null, report = {} } = data || {};
   const appMessages = {
-    cloudigradeMismatch: false,
-    query
+    cloudigradeMismatch: false
   };
 
   const cache = (viewId && productId && selectorCache.data[`${viewId}_${productId}`]) || undefined;
@@ -70,7 +69,7 @@ const selector = createSelector([statePropsFilter, queryFilter], (data, query =
     };
   }
 
-  return { appMessages };
+  return { appMessages, query };
 });
 
 /**