diff --git a/src/App.js b/src/App.js
index eade010..f857ba1 100644
--- a/src/App.js
+++ b/src/App.js
@@ -18,6 +18,7 @@ import Register from "./components/screens/Register"
 import Start from "./components/screens/Start"
 import PrivateRoute from "./components/PrivateRoute"
 
+import { OnlineContext } from "./components/context/online"
 import { withAuthentication } from "./components/session"
 import { withFirebase } from "./components/firebase"
 
@@ -42,6 +43,17 @@ class App extends Component {
       new Date().getHours() >= 7 && new Date().getHours() <= 21
         ? "LIGHT"
         : "DARK",
+    online: navigator.onLine,
+  }
+
+  componentDidMount() {
+    window.addEventListener('online', () => {
+      this.setState({ online: true })
+    });
+    
+    window.addEventListener('offline', () => {
+      this.setState({ online: false })
+    });
   }
 
   onChangeTheme = () => {
@@ -69,43 +81,45 @@ class App extends Component {
   }
 
   render() {
-    const { selectedTheme, authUser } = this.state
+    const { selectedTheme, authUser, online } = this.state
     const { authUser: propAuthUser } = this.props
     const authed = !!propAuthUser || !!authUser
 
     const currentTheme = theme[selectedTheme]
     return (
       <ThemeProvider theme={currentTheme}>
-        <Router>
-          <FullscreenLayout>
-            <Navbar toggleTheme={this.onChangeTheme} />
-            <RouteLayout>
-              <PrivateRoute
-                authed={authed}
-                path="/:year(\d+)"
-                component={Year}
-                exact
-              />
-              <PrivateRoute
-                authed={authed}
-                path="/:year(\d+)/:month(0[1-9]|1[0-2]+)"
-                component={Month}
-                exact
-              />
-              <PrivateRoute
-                authed={authed}
-                path="/:year(\d+)/:month(0[1-9]|1[0-2]+)/:day(\d+)"
-                component={Day}
-                exact
-              />
-              <Route path="/user" component={User} exact />
-              <Route path="/login" component={Login} exact />
-              <Route path="/search" component={Search} exact />
-              <Route path="/register" component={Register} exact />
-              <Route path="/" component={Start} exact />
-            </RouteLayout>
-          </FullscreenLayout>
-        </Router>
+        <OnlineContext.Provider value={online}>
+          <Router>
+            <FullscreenLayout>
+              <Navbar toggleTheme={this.onChangeTheme} />
+              <RouteLayout>
+                <PrivateRoute
+                  authed={authed}
+                  path="/:year(\d+)"
+                  component={Year}
+                  exact
+                />
+                <PrivateRoute
+                  authed={authed}
+                  path="/:year(\d+)/:month(0[1-9]|1[0-2]+)"
+                  component={Month}
+                  exact
+                />
+                <PrivateRoute
+                  authed={authed}
+                  path="/:year(\d+)/:month(0[1-9]|1[0-2]+)/:day(\d+)"
+                  component={Day}
+                  exact
+                />
+                <Route path="/user" component={User} exact />
+                <Route path="/login" component={Login} exact />
+                <Route path="/search" component={Search} exact />
+                <Route path="/register" component={Register} exact />
+                <Route path="/" component={Start} exact />
+              </RouteLayout>
+            </FullscreenLayout>
+          </Router>
+        </OnlineContext.Provider>
       </ThemeProvider>
     )
   }
diff --git a/src/components/context/online.js b/src/components/context/online.js
new file mode 100644
index 0000000..9229456
--- /dev/null
+++ b/src/components/context/online.js
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export const OnlineContext = React.createContext({
+  online: navigator.onLine,
+});
\ No newline at end of file
diff --git a/src/components/screens/Day/Day.js b/src/components/screens/Day/Day.js
index 3c7df11..ff56f6d 100644
--- a/src/components/screens/Day/Day.js
+++ b/src/components/screens/Day/Day.js
@@ -8,6 +8,7 @@ import { withRouter } from "react-router-dom"
 import { withTheme } from "emotion-theming"
 import { withFirebase } from "../../firebase"
 import { withAuthentication } from "../../session"
+import { OnlineContext } from "../../context/online"
 import { addDays, subDays, format, isAfter, startOfYesterday } from "date-fns"
 import { BeatLoader } from "react-spinners"
 
@@ -23,6 +24,11 @@ const EntryHeading = styled.div`
   justify-content: space-between;
   margin-top: ${SIZES.medium};
 `
+const EntryInfo = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+`
 const JournalHeading = styled.h2`
   font-weight: 700;
   font-size: ${SIZES.tiny};
@@ -37,6 +43,13 @@ const SavedMessaged = styled.div`
   font-size: ${SIZES.tiny};
   user-select: none;
 `
+const OfflineNotice = styled.div`
+  padding: 5px;
+  color: ${props => props.theme.colors.secondary};
+  border: 1px solid;
+  border-color: ${props => props.theme.colors.tertiary};
+  border-radius: 3px;
+`
 const JournalEntryArea = styled.textarea`
   font-family: sans-serif;
   flex-grow: 0.85;
@@ -95,6 +108,8 @@ class Day extends React.Component {
   timeout = 0
   retrievedFromServer = false
 
+  static contextType = OnlineContext
+
   componentDidMount() {
     const {
       history,
@@ -137,6 +152,7 @@ class Day extends React.Component {
       })
       .catch(err => {
         console.warn("entry not found in cache")
+        this.setState({ loading: false})
         // for cache first, server second fetching, dangerous with potential overwriting of data
         // docRef.get().then(doc => {
         //   if (doc.data()) {
@@ -184,10 +200,7 @@ class Day extends React.Component {
 
   saveText = (text, year, month, day) => {
     this.setState({ saving: true })
-    const {
-      firebase,
-      authUser,
-    } = this.props
+    const { firebase, authUser } = this.props
     firebase.db
       .collection("entries")
       .doc(`${year}${month}${day}-${authUser.uid}`)
@@ -215,6 +228,7 @@ class Day extends React.Component {
       },
       theme,
     } = this.props
+    const online = this.context
     const { text, loading, saving, lastSavedAt, lastEditedAt } = this.state
     const currentDay = new Date(year, month - 1, day)
     if (!currentDay) return
@@ -222,7 +236,10 @@ class Day extends React.Component {
 
     return (
       <>
-        <Prompt when={!hasSavedChanges} message="You have unsaved changes, are you sure you want to leave?" />
+        <Prompt
+          when={!hasSavedChanges}
+          message="You have unsaved changes, are you sure you want to leave?"
+        />
         <Seek
           title={format(currentDay, "YYYY MMM DD - dddd")}
           prev={format(subDays(currentDay, 1), "/YYYY/MM/DD")}
@@ -231,24 +248,27 @@ class Day extends React.Component {
         />
         <EntryHeading>
           <JournalHeading>RECORD THOUGHTS ABOUT YOUR DAY</JournalHeading>
-          <SavedMessaged>
-            {saving ? (
-              <>
-                Saving
-                <LoadingSpinner
-                  color={theme.colors.quarternary}
-                  size={5}
-                  css={css`
-                    animation: 1s ease-in;
-                  `}
-                />
-              </>
-            ) : hasSavedChanges ? (
-              `Last saved at ${format(lastSavedAt, "h:mma")}`
-            ) : (
-              "Unsaved changes"
-            )}
-          </SavedMessaged>
+          <EntryInfo>
+            <SavedMessaged>
+              {saving ? (
+                <>
+                  Saving
+                  <LoadingSpinner
+                    color={theme.colors.quarternary}
+                    size={5}
+                    css={css`
+                      animation: 1s ease-in;
+                    `}
+                  />
+                </>
+              ) : hasSavedChanges ? (
+                `Last saved at ${format(lastSavedAt, "h:mma")}`
+              ) : (
+                "Unsaved changes"
+              )}
+            </SavedMessaged>
+            {!online && <OfflineNotice>Offline</OfflineNotice>}
+          </EntryInfo>
         </EntryHeading>
         {loading ? (
           <div style={{ marginTop: 10 }}>