diff --git a/app/soapbox/actions/__tests__/me.test.ts b/app/soapbox/actions/__tests__/me.test.ts
index 11ea808be..d4dc1d31f 100644
--- a/app/soapbox/actions/__tests__/me.test.ts
+++ b/app/soapbox/actions/__tests__/me.test.ts
@@ -2,6 +2,7 @@ import { Map as ImmutableMap } from 'immutable';
 
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
+import { AccountRecord } from 'soapbox/normalizers';
 
 import { AuthUserRecord, ReducerRecord } from '../../reducers/auth';
 import {
@@ -48,9 +49,9 @@ describe('fetchMe()', () => {
           }),
         }))
         .set('accounts', ImmutableMap({
-          [accountUrl]: {
+          [accountUrl]: AccountRecord({
             url: accountUrl,
-          },
+          }),
         }) as any);
       store = mockStore(state);
     });
diff --git a/app/soapbox/utils/auth.ts b/app/soapbox/utils/auth.ts
index d826c752a..9c5d14d6f 100644
--- a/app/soapbox/utils/auth.ts
+++ b/app/soapbox/utils/auth.ts
@@ -49,7 +49,7 @@ export const getAuthUserId = (state: RootState) => {
   return ImmutableList([
     state.auth.users.get(me!)?.id,
     me,
-  ]).find(validId);
+  ].filter(id => id)).find(validId);
 };
 
 export const getAuthUserUrl = (state: RootState) => {