diff --git a/src/App.js b/src/App.js
index 317df57..dff0710 100644
--- a/src/App.js
+++ b/src/App.js
@@ -201,7 +201,7 @@ class App extends React.Component {
               <>
                 <Switch>
                   <Route path="/" exact>
-                    <LoggedInHome db={db} functions={functions} user={this.state.user} />
+                    <LoggedInHome db={db} firebase={firebase} functions={functions} user={this.state.user} />
                   </Route>
                   <Route path="/sets/:setId" exact>
                     <SetPage db={db} functions={functions} user={this.state.user} />
diff --git a/src/LoggedInHome.js b/src/LoggedInHome.js
index bfb38f7..2b74c1e 100644
--- a/src/LoggedInHome.js
+++ b/src/LoggedInHome.js
@@ -48,7 +48,7 @@ export default withRouter(class LoggedInHome extends React.Component {
 				{
 					type: "button",
 					name: "Logout",
-					onClick: () => this.state.firebase.auth().signOut(),
+					onClick: () => this.props.firebase.auth().signOut(),
 					icon: <ExitToAppRoundedIcon />,
 					hideTextMobile: true,
 				}
diff --git a/src/Login.js b/src/Login.js
index 7d3b801..8dda8c4 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -10,7 +10,6 @@ import { CloseRounded as CloseRoundedIcon } from "@material-ui/icons";
 import "firebase/auth";
 
 export default function Login(props) {
-	const auth = props.auth;
 	const uiConfig = {
 		signInFlow: 'redirect',
 		signInSuccessUrl: '/',
@@ -33,7 +32,7 @@ export default function Login(props) {
 			<Link to="/" className="overlay"></Link>
 			<div className="overlay-content login-overlay-content">
 				<h1>Login</h1>
-				<StyledFirebaseAuth uiConfig={uiConfig} firebaseAuth={auth} />
+				<StyledFirebaseAuth uiConfig={uiConfig} firebaseAuth={props.firebase.auth()} />
 				<Link className="popup-close-button" to="/">
 					<CloseRoundedIcon />
 				</Link>