diff --git a/src/pages/404.js b/src/pages/404.js
index 47f446e4..9bee8f2d 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -2,8 +2,9 @@ import React from "react";
 
 import Layout from "../components/layout";
 import SEO from "../components/seo";
+import PropTypes from 'prop-types';
 
-function NotFoundPage() {
+function NotFoundPage({ location }) {
   return (
     <Layout>
       <SEO
@@ -19,4 +20,9 @@ function NotFoundPage() {
   );
 }
 
+NotFoundPage.propTypes = {
+  location: PropTypes.object,
+};
+
+
 export default NotFoundPage;
diff --git a/src/pages/about.js b/src/pages/about.js
index f38cc293..156660b7 100644
--- a/src/pages/about.js
+++ b/src/pages/about.js
@@ -2,8 +2,9 @@ import React from "react";
 
 import Layout from "../components/layout";
 import SEO from "../components/seo";
+import PropTypes from 'prop-types';
 
-function AboutPage() {
+function AboutPage({ location }) {
   return (
     <Layout>
       <SEO
@@ -22,4 +23,9 @@ function AboutPage() {
   );
 }
 
+AboutPage.propTypes = {
+  location: PropTypes.object,
+};
+
+
 export default AboutPage;
diff --git a/src/pages/index.js b/src/pages/index.js
index b0539d84..5c009ef4 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 
 import { graphql } from "gatsby"
 
-const IndexPage = ({ data: { allMarkdownRemark: { edges } }}) => {
+const IndexPage = ({ data: { allMarkdownRemark: { edges } }, location}) => {
   const Posts = edges
     .filter(edge => !!edge.node.frontmatter.date) // You can filter your posts based on some criteria
     .map(edge => <PostLink key={edge.node.id} post={edge.node} />)
@@ -32,6 +32,7 @@ const IndexPage = ({ data: { allMarkdownRemark: { edges } }}) => {
 }
 
 IndexPage.propTypes = {
+  location: PropTypes.object,
   data: PropTypes.shape({
     allMarkdownRemark: PropTypes.shape({
       edges: PropTypes.array
diff --git a/src/pages/lab.js b/src/pages/lab.js
index 67995ce8..5f12876d 100644
--- a/src/pages/lab.js
+++ b/src/pages/lab.js
@@ -2,9 +2,10 @@ import React from "react";
 
 import Layout from "../components/layout";
 import SEO from "../components/seo";
+import PropTypes from 'prop-types';
 import {Link} from 'gatsby';
 
-function LabPage() {
+function LabPage({ location }) {
   return (
     <Layout>
       <SEO
@@ -132,4 +133,9 @@ function LabPage() {
   );
 }
 
+LabPage.propTypes = {
+  location: PropTypes.object,
+};
+
+
 export default LabPage;
diff --git a/src/pages/lab/catalog.js b/src/pages/lab/catalog.js
index 6b4279c0..81d08ea3 100644
--- a/src/pages/lab/catalog.js
+++ b/src/pages/lab/catalog.js
@@ -2,8 +2,9 @@ import React from "react";
 
 import Layout from "../../components/layout";
 import SEO from "../../components/seo";
+import PropTypes from 'prop-types';
 
-function LabPage() {
+function LabCatalogPage({ location }) {
   return (
     <Layout>
       <SEO
@@ -112,4 +113,9 @@ function LabPage() {
   );
 }
 
-export default LabPage;
+LabCatalogPage.propTypes = {
+  location: PropTypes.object,
+};
+
+
+export default LabCatalogPage;
diff --git a/src/templates/blog-post.js b/src/templates/blog-post.js
index 8f170cef..049b315b 100644
--- a/src/templates/blog-post.js
+++ b/src/templates/blog-post.js
@@ -8,7 +8,7 @@ import CommentSection from '../components/comment-section';
 import CommentForm from '../components/comment-form';
 
 // the data prop will be injected by the GraphQL query below.
-const Template = ({ data }) => {
+const Template = ({ data, location }) => {
   const { posts, comments } = data // data.posts holds your post data
   const { frontmatter, excerpt, html } = posts;