diff --git a/components/pages/events/index.vue b/components/pages/events/index.vue
index 44c6260..d969fb9 100644
--- a/components/pages/events/index.vue
+++ b/components/pages/events/index.vue
@@ -139,16 +139,14 @@
         if (this.origin) {
           origins.push(this.origin);
         }
-        const variables = {range: this.range, origins: origins.length > 0 ? origins : null};
-        if (this.hasUser) {
-          findEventsAndOrigins(variables)
-              .then(this.eventsFetched)
-              .catch(this.eventsFailed);
-        } else {
-          findEvents(variables)
-              .then(this.eventsFetched)
-              .catch(this.eventsFailed);
-        }
+        const variables = {
+          range: this.range,
+          origins: origins.length > 0 ? origins : null,
+          includeOrigins: this.hasUser
+        };
+        findEvents(variables)
+            .then(this.eventsFetched)
+            .catch(this.eventsFailed);
       },
       eventsFetched(response) {
         if (response.errors) {
diff --git a/utils/graph-client/index.js b/utils/graph-client/index.js
index cc7fb8e..82dd3ab 100644
--- a/utils/graph-client/index.js
+++ b/utils/graph-client/index.js
@@ -1,6 +1,5 @@
 export {
   findEvents,
-  findEventsAndOrigins,
   findOrigins,
   fetchAddress,
   fetchFilters,
diff --git a/utils/graph-client/queries.js b/utils/graph-client/queries.js
index 0000b9b..648113a 100644
--- a/utils/graph-client/queries.js
+++ b/utils/graph-client/queries.js
@@ -1,7 +1,6 @@
 import { createQuery } from './utils';
 import {
   eventsQuery,
-  eventsAndOriginsQuery,
   originsQuery,
   addressFromLatLngQuery,
   filtersQuery,
@@ -9,7 +8,6 @@ import {
 
 /* eslint-disable max-len */
 export const findEvents = variables => createQuery(eventsQuery, variables);
-export const findEventsAndOrigins = variables => createQuery(eventsAndOriginsQuery, variables);
 export const findOrigins = () => createQuery(originsQuery);
 export const fetchAddress = variables => createQuery(addressFromLatLngQuery, variables);
 export const fetchFilters = () => createQuery(filtersQuery);
diff --git a/utils/graph-client/queryStrings.js b/utils/graph-client/queryStrings.js
index 27f58d4..647d5d8 100644
--- a/utils/graph-client/queryStrings.js
+++ b/utils/graph-client/queryStrings.js
@@ -21,15 +21,9 @@ export const eventQuery = `
 `;
 
 export const eventsQuery = `
-  query events($range: Range $origins: [String!]) {
+  query events($range: Range $origins: [String!] $includeOrigins: Boolean!) {
     ${eventQuery}
-  }
-`;
-
-export const eventsAndOriginsQuery = `
-  query events($range: Range $origins: [String!]) {
-    ${eventQuery}
-    origins: Origins
+    origins: Origins @include(if: $includeOrigins)
   }
 `;