diff --git a/components/Editor.js b/components/Editor.js
index e472e1c..016c238 100644
--- a/components/Editor.js
+++ b/components/Editor.js
@@ -45,7 +45,6 @@ class Editor extends React.Component {
       ...DEFAULT_SETTINGS,
       loading: true,
       code: props.content,
-      online: true,
       preset: DEFAULT_PRESET_ID
     }
 
@@ -87,8 +86,7 @@ class Editor extends React.Component {
       ...getSettings(localStorage),
       // and then URL params
       ...initialState,
-      loading: false,
-      online: Boolean(window && window.navigator && window.navigator.onLine)
+      loading: false
     }
 
     // Makes sure the slash in 'application/X' is decoded
@@ -98,27 +96,17 @@ class Editor extends React.Component {
 
     this.updateState(newState)
 
-    window.addEventListener('offline', this.setOffline)
-    window.addEventListener('online', this.setOnline)
-
     this.isSafari =
       window.navigator &&
       window.navigator.userAgent.indexOf('Safari') !== -1 &&
       window.navigator.userAgent.indexOf('Chrome') === -1
   }
 
-  componentWillUnmount() {
-    window.removeEventListener('offline', this.setOffline)
-    window.removeEventListener('online', this.setOnline)
-  }
-
   updateState = updates => this.setState(updates, () => this.props.onUpdate(this.state))
 
   updateCode = code => this.updateState({ code })
   updateAspectRatio = aspectRatio => this.updateState({ aspectRatio })
   updateTitleBar = titleBar => this.updateState({ titleBar })
-  setOffline = () => this.updateState({ online: false })
-  setOnline = () => this.updateState({ online: true })
 
   async getCarbonImage(
     {
@@ -293,7 +281,6 @@ class Editor extends React.Component {
       backgroundImage,
       backgroundMode,
       aspectRatio,
-      online,
       titleBar,
       code,
       exportSize
@@ -348,7 +335,7 @@ class Editor extends React.Component {
               getCarbonImage={this.getCarbonImage}
             />
             <div className="buttons">
-              {this.props.api.tweet && online && <TweetButton onClick={this.upload} />}
+              {this.props.api.tweet && <TweetButton onClick={this.upload} />}
               <ExportMenu
                 onChange={this.updateSetting}
                 export={this.export}
diff --git a/components/TweetButton.js b/components/TweetButton.js
index 2844736..1104372 100644
--- a/components/TweetButton.js
+++ b/components/TweetButton.js
@@ -3,8 +3,28 @@ import { useAsyncCallback } from '@dawnlabs/tacklebox'
 
 import Button from './Button'
 
+function useWindowListener(key, fn) {
+  React.useEffect(() => {
+    window.addEventListener(key, fn)
+    return () => window.removeEventListener(key, fn)
+  }, [])
+}
+
 function TweetButton(props) {
+  const [online, setOnline] = React.useState(true)
   const [onClick, { loading }] = useAsyncCallback(props.onClick)
+
+  React.useEffect(() => {
+    setOnline(Boolean(window && window.navigator && window.navigator.onLine))
+  }, [])
+
+  useWindowListener('offline', () => setOnline(false))
+  useWindowListener('online', () => setOnline(true))
+
+  if (!online) {
+    return null
+  }
+
   return (
     <Button border large padding="0 16px" margin="0 8px 0 0" onClick={onClick} color="#57b5f9">
       {loading ? 'Loading...' : 'Tweet'}