diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx
index cc959be997..2a4f98d0c6 100644
--- a/src/screens/StarterPack/Wizard/StepFeeds.tsx
+++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx
@@ -4,6 +4,7 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
 import debounce from 'lodash.debounce'
 
+import {DISCOVER_FEED_URI} from 'lib/constants'
 import {
   useGetPopularFeedsQuery,
   useSearchPopularFeedsMutation,
@@ -29,36 +30,6 @@ export function StepFeeds() {
   const popularFeeds =
     popularFeedsPages?.pages.flatMap(page => page.feeds) || []
 
-  // const popularFeeds = [
-  //   {
-  //     uri: 'at://did:plc:i2g4cq5neuol2n5kadpffqok/app.bsky.feed.generator/alice-favs',
-  //     cid: 'bafyreidgvy4vlvvhx3lhpyej2qido3m5sk2l5643bhbmqtgfuxwz53xqlm',
-  //     did: 'did:plc:epfqsozl6rso6ebd6mkfyzpl',
-  //     creator: {
-  //       did: 'did:plc:vyhhvdf4xw5nziakfxxsynwk',
-  //       handle: 'alice.test',
-  //       displayName: 'Alice',
-  //       viewer: {
-  //         muted: false,
-  //         blockedBy: false,
-  //       },
-  //       labels: [],
-  //       description: 'Test user 1',
-  //       indexedAt: '2024-06-10T17:37:36.662Z',
-  //     },
-  //     displayName: 'alices feed',
-  //     description: 'all my fav stuff',
-  //     avatar:
-  //       'http://localhost:2584/img/avatar/plain/did:plc:vyhhvdf4xw5nziakfxxsynwk/bafkreihem6nzbu462kcx5cqnrkonpq75fe5dlbhgnzcmuvvhqk7s5vcq3u@jpeg',
-  //     likeCount: 3,
-  //     labels: [],
-  //     viewer: {
-  //       like: 'at://did:plc:vyhhvdf4xw5nziakfxxsynwk/app.bsky.feed.like/3kulmhjxuoc2g',
-  //     },
-  //     indexedAt: '2022-07-15T00:51:16.914Z',
-  //   },
-  // ]
-
   const {
     data: searchedFeeds,
     mutate: search,
@@ -79,6 +50,10 @@ export function StepFeeds() {
     }
   }
 
+  const filterFeeds = (feeds?: GeneratorView[]) => {
+    return feeds?.filter(feed => feed.uri !== DISCOVER_FEED_URI)
+  }
+
   const renderItem = ({item}: ListRenderItemInfo<GeneratorView>) => {
     return <WizardFeedCard generator={item} state={state} dispatch={dispatch} />
   }
@@ -96,7 +71,7 @@ export function StepFeeds() {
         </View>
       </View>
       <List
-        data={query ? searchedFeeds : popularFeeds}
+        data={filterFeeds(query ? searchedFeeds : popularFeeds)}
         renderItem={renderItem}
         keyExtractor={keyExtractor}
         onEndReached={!query ? () => fetchNextPage() : undefined}
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index c5fc8dcc67..7259c8b2ff 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -481,6 +481,10 @@ function Footer({
 
   const items = state.currentStep === 'Profiles' ? state.profiles : state.feeds
 
+  const isEditEnabled =
+    (state.currentStep === 'Profiles' && items.length > 1) ||
+    (state.currentStep === 'Feeds' && items.length > 0)
+
   const textStyles = [isWeb && a.text_md]
 
   return (
@@ -573,30 +577,36 @@ function Footer({
         </Text>
       )}
 
-      <View
-        style={[a.flex_row, a.w_full, a.justify_between, {marginTop: 'auto'}]}>
-        <Button
-          label={_(msg`Edit`)}
-          variant="ghost"
-          color="primary"
-          size="small"
-          disabled={items.length === 0}
-          onPress={editDialogControl.open}>
-          <ButtonText>
-            <Trans>Edit</Trans>
-          </ButtonText>
-        </Button>
-        <Button
-          label={nextBtnText}
-          variant="solid"
-          color="primary"
-          size="small"
-          onPress={onNext}
-          disabled={!state.canNext || state.processing}>
-          <ButtonText>{nextBtnText}</ButtonText>
-          {state.processing && <Loader size="xs" style={{color: 'white'}} />}
-        </Button>
-      </View>
+      {isEditEnabled && (
+        <View
+          style={[
+            a.flex_row,
+            a.w_full,
+            a.justify_between,
+            {marginTop: 'auto'},
+          ]}>
+          <Button
+            label={_(msg`Edit`)}
+            variant="ghost"
+            color="primary"
+            size="small"
+            onPress={editDialogControl.open}>
+            <ButtonText>
+              <Trans>Edit</Trans>
+            </ButtonText>
+          </Button>
+          <Button
+            label={nextBtnText}
+            variant="solid"
+            color="primary"
+            size="small"
+            onPress={onNext}
+            disabled={!state.canNext || state.processing}>
+            <ButtonText>{nextBtnText}</ButtonText>
+            {state.processing && <Loader size="xs" style={{color: 'white'}} />}
+          </Button>
+        </View>
+      )}
 
       <WizardEditListDialog
         control={editDialogControl}