diff --git a/desktop/app/src/dispatcher/user.tsx b/desktop/app/src/dispatcher/user.tsx
index affa9c7df..954318ea3 100644
--- a/desktop/app/src/dispatcher/user.tsx
+++ b/desktop/app/src/dispatcher/user.tsx
@@ -21,7 +21,11 @@ export default (store: Store, _logger: Logger) => {
 
   getUser()
     .then((user) => {
-      store.dispatch(login(user));
+      if (user) {
+        store.dispatch(login(user));
+      } else {
+        store.dispatch(logout());
+      }
     })
     .catch((e) => {
       store.dispatch(logout());
diff --git a/desktop/app/src/fb-stubs/user.tsx b/desktop/app/src/fb-stubs/user.tsx
index 6d6fff3b0..5449364a7 100644
--- a/desktop/app/src/fb-stubs/user.tsx
+++ b/desktop/app/src/fb-stubs/user.tsx
@@ -10,7 +10,7 @@
 import {Atom, createState} from 'flipper-plugin';
 import {User} from '../reducers/user';
 
-export async function getUser(): Promise<User> {
+export async function getUser(): Promise<User | null> {
   throw new Error('Feature not implemented');
 }