diff --git a/lib/hooks/user-identities-hooks.js b/lib/hooks/user-identities-hooks.js
--- a/lib/hooks/user-identities-hooks.js
+++ b/lib/hooks/user-identities-hooks.js
@@ -3,7 +3,6 @@
 import * as React from 'react';
 
 import { useFindUserIdentities } from '../actions/find-user-identities-actions.js';
-import { userHasDeviceList } from '../shared/thread-utils.js';
 import { useSelector } from '../utils/redux-utils.js';
 
 function useUsersSupportThickThreads(): (
@@ -18,7 +17,7 @@
 
       const usersNeedingFetch = [];
       for (const userID of userIDs) {
-        if (userHasDeviceList(userID, auxUserInfos)) {
+        if (auxUserInfos[userID]?.deviceList) {
           usersSupportingThickThreads.add(userID);
         } else {
           usersNeedingFetch.push(userID);