diff --git a/gatsby-browser.js b/gatsby-browser.js
index 8d785a8..334acc9 100644
--- a/gatsby-browser.js
+++ b/gatsby-browser.js
@@ -1,3 +1,11 @@
 exports.onInitialClientRender = () => {
   require('./src/styles/base.scss')
 }
+
+exports.onClientEntry = () => {
+  // IntersectionObserver polyfill for gatsby-image (Safari, IE)
+  if (typeof window.IntersectionObserver === 'undefined') {
+    require('intersection-observer')
+    console.log('👍 IntersectionObserver is polyfilled') // eslint-disable-line no-console
+  }
+}
diff --git a/gatsby-node.js b/gatsby-node.js
index e9d8eaa..b25843a 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -3,22 +3,22 @@ const path = require('path')
 // Intersection Observer polyfill
 // requires `npm install intersection-observer`
 // https://github.com/gatsbyjs/gatsby/issues/2288#issuecomment-334467821
-exports.onCreateWebpackConfig = ({ actions, loaders, stage }) => {
-  const { setWebpackConfig } = actions
+// exports.onCreateWebpackConfig = ({ actions, loaders, stage }) => {
+//   const { setWebpackConfig } = actions
 
-  if (stage === 'build-html') {
-    const nullRule = {
-      test: /intersection-observer/,
-      use: [loaders.null()]
-    }
+//   if (stage === 'build-html') {
+//     const nullRule = {
+//       test: /intersection-observer/,
+//       use: [loaders.null()]
+//     }
 
-    setWebpackConfig({
-      module: {
-        rules: [nullRule]
-      }
-    })
-  }
-}
+//     setWebpackConfig({
+//       module: {
+//         rules: [nullRule]
+//       }
+//     })
+//   }
+// }
 
 //
 // Create project pages from projects.yml