diff --git a/app/components/ErrorBoundary.js b/app/components/ErrorBoundary.js
index e578a4e9..d7b07f45 100644
--- a/app/components/ErrorBoundary.js
+++ b/app/components/ErrorBoundary.js
@@ -1,4 +1,5 @@
 // @flow
+import * as Sentry from "@sentry/react";
 import { observable } from "mobx";
 import { observer } from "mobx-react";
 import * as React from "react";
@@ -36,8 +37,8 @@ class ErrorBoundary extends React.Component<Props> {
       return;
     }
 
-    if (window.Sentry) {
-      window.Sentry.captureException(error);
+    if (env.SENTRY_DSN) {
+      Sentry.captureException(error);
     }
   }
 
@@ -56,7 +57,7 @@ class ErrorBoundary extends React.Component<Props> {
   render() {
     if (this.error) {
       const error = this.error;
-      const isReported = !!window.Sentry && env.DEPLOYMENT === "hosted";
+      const isReported = !!env.SENTRY_DSN && env.DEPLOYMENT === "hosted";
       const isChunkError = this.error.message.match(/chunk/);
 
       if (isChunkError) {
diff --git a/app/stores/AuthStore.js b/app/stores/AuthStore.js
index 091e214f..dbee69eb 100644
--- a/app/stores/AuthStore.js
+++ b/app/stores/AuthStore.js
@@ -1,10 +1,12 @@
 // @flow
+import * as Sentry from "@sentry/react";
 import invariant from "invariant";
 import { observable, action, computed, autorun, runInAction } from "mobx";
 import { getCookie, setCookie, removeCookie } from "tiny-cookie";
 import RootStore from "stores/RootStore";
 import Team from "models/Team";
 import User from "models/User";
+import env from "env";
 import { client } from "utils/ApiClient";
 import { getCookieDomain } from "utils/domains";
 
@@ -125,8 +127,8 @@ export default class AuthStore {
         this.user = new User(user);
         this.team = new Team(team);
 
-        if (window.Sentry) {
-          window.Sentry.configureScope(function (scope) {
+        if (env.SENTRY_DSN) {
+          Sentry.configureScope(function (scope) {
             scope.setUser({ id: user.id });
             scope.setExtra("team", team.name);
             scope.setExtra("teamId", team.id);