diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx
index 8f58c1445f..86420dac68 100644
--- a/src/screens/StarterPack/Wizard/StepProfiles.tsx
+++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx
@@ -4,8 +4,7 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {AppBskyActorDefs} from '@atproto/api'
 
 import {useActorAutocompleteQuery} from 'state/queries/actor-autocomplete'
-import {useProfileFollowsQuery} from 'state/queries/profile-follows'
-import {useSession} from 'state/session'
+import {useActorSearch} from 'state/queries/actor-search'
 import {SearchInput} from 'view/com/util/forms/SearchInput'
 import {List} from 'view/com/util/List'
 import {useWizardState} from '#/screens/StarterPack/Wizard/State'
@@ -23,17 +22,11 @@ export function StepProfiles() {
   const [state, dispatch] = useWizardState()
   const [query, setQuery] = useState('')
 
-  const {currentAccount} = useSession()
-  const {data: followsPages, fetchNextPage} = useProfileFollowsQuery(
-    currentAccount?.did,
-  )
-  const follows = followsPages?.pages.flatMap(page => page.follows) || []
-
-  const {data: results} = useActorAutocompleteQuery(
-    query || encodeURIComponent('*'),
-    true,
-    12,
-  )
+  const {data: topFollowers} = useActorSearch({
+    query: encodeURIComponent('*'),
+    limit: 50,
+  })
+  const {data: results} = useActorAutocompleteQuery(query, true, 12)
 
   const renderItem = ({
     item,
@@ -56,12 +49,10 @@ export function StepProfiles() {
         </View>
       </View>
       <List
-        data={query ? results : follows}
+        data={query ? results : topFollowers}
         renderItem={renderItem}
         keyExtractor={keyExtractor}
         contentContainerStyle={{paddingTop: 12}}
-        onEndReached={!query ? () => fetchNextPage() : undefined}
-        onEndReachedThreshold={2}
         renderScrollComponent={props => <KeyboardAwareScrollView {...props} />}
         keyboardShouldPersistTaps="handled"
         containWeb={true}
diff --git a/src/state/queries/actor-search.ts b/src/state/queries/actor-search.ts
index 1e301a1bac..00fee6f63f 100644
--- a/src/state/queries/actor-search.ts
+++ b/src/state/queries/actor-search.ts
@@ -9,9 +9,11 @@ export const RQKEY = (query: string) => [RQKEY_ROOT, query]
 
 export function useActorSearch({
   query,
+  limit = 20,
   enabled,
 }: {
   query: string
+  limit?: number
   enabled?: boolean
 }) {
   const agent = useAgent()
@@ -21,6 +23,7 @@ export function useActorSearch({
     async queryFn() {
       const res = await agent.searchActors({
         q: query,
+        limit,
       })
       return res.data.actors
     },