diff --git a/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx b/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
index 2597ee61f..3c666e84a 100644
--- a/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
@@ -126,9 +126,11 @@ function Player({
 export function ExternalPlayer({
   link,
   params,
+  preview,
 }: {
   link: AppBskyEmbedExternal.ViewExternal
   params: EmbedPlayerParams
+  preview?: boolean
 }) {
   const t = useTheme()
   const navigation = useNavigation<NavigationProp>()
@@ -235,10 +237,12 @@ export function ExternalPlayer({
             <Image
               style={[a.flex_1]}
               source={{
-                uri: applyImageTransforms(link.thumb, {
-                  imageCdnHost,
-                  format: thumbnailFormat,
-                }),
+                uri: preview
+                  ? link.thumb
+                  : applyImageTransforms(link.thumb, {
+                      imageCdnHost,
+                      format: thumbnailFormat,
+                    }),
               }}
               accessibilityIgnoresInvertColors
               loading="lazy"
diff --git a/src/components/Post/Embed/ExternalEmbed/index.tsx b/src/components/Post/Embed/ExternalEmbed/index.tsx
index cc135e94c..d6e3a25ef 100644
--- a/src/components/Post/Embed/ExternalEmbed/index.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/index.tsx
@@ -34,11 +34,13 @@ export const ExternalEmbed = ({
   onOpen,
   style,
   hideAlt,
+  preview,
 }: {
   link: AppBskyEmbedExternal.ViewExternal
   onOpen?: () => void
   style?: StyleProp<ViewStyle>
   hideAlt?: boolean
+  preview?: boolean
 }) => {
   const {_} = useLingui()
   const t = useTheme()
@@ -48,10 +50,12 @@ export const ExternalEmbed = ({
   const imageCdnHost = useImageCdnHost()
   const niceUrl = toNiceDomain(link.uri)
   const imageUri = link.thumb
-    ? applyImageTransforms(link.thumb, {
-        imageCdnHost,
-        format: thumbnailFormat,
-      })
+    ? preview
+      ? link.thumb
+      : applyImageTransforms(link.thumb, {
+          imageCdnHost,
+          format: thumbnailFormat,
+        })
     : undefined
   const embedPlayerParams = useMemo(() => {
     const params = parseEmbedPlayerFromUrl(link.uri)
@@ -126,7 +130,11 @@ export const ExternalEmbed = ({
           {embedPlayerParams?.isGif ? (
             <ExternalGif link={link} params={embedPlayerParams} />
           ) : embedPlayerParams ? (
-            <ExternalPlayer link={link} params={embedPlayerParams} />
+            <ExternalPlayer
+              link={link}
+              params={embedPlayerParams}
+              preview={preview}
+            />
           ) : undefined}
 
           <View
diff --git a/src/screens/Search/SearchResults.tsx b/src/screens/Search/SearchResults.tsx
index ec3248b2b..2c55c3942 100644
--- a/src/screens/Search/SearchResults.tsx
+++ b/src/screens/Search/SearchResults.tsx
@@ -126,19 +126,10 @@ function EmptyState({
   messageText,
   error,
   children,
-  button,
-  buttonAlign = 'center',
 }: {
   messageText: React.ReactNode
   error?: string
   children?: React.ReactNode
-  button?: {
-    label: string
-    text: string
-    onPress: () => void
-    disabled?: boolean
-  }
-  buttonAlign?: 'left' | 'center'
 }) {
   const t = useTheme()
 
@@ -169,23 +160,6 @@ function EmptyState({
           )}
 
           {children}
-
-          {button && (
-            <View
-              style={[
-                a.mt_lg,
-                buttonAlign === 'left' ? a.align_start : a.align_center,
-              ]}>
-              <Button
-                label={button.label}
-                color="primary"
-                size="small"
-                disabled={button.disabled}
-                onPress={button.onPress}>
-                <ButtonText>{button.text}</ButtonText>
-              </Button>
-            </View>
-          )}
         </View>
       </View>
     </Layout.Content>
@@ -208,6 +182,10 @@ function SearchResultsFooter({
     return <ListFooter isFetchingNextPage />
   }
 
+  if (!hasNextPage) {
+    return <ListFooter hasNextPage={false} showEndMessage />
+  }
+
   return (
     <View
       style={[
@@ -223,10 +201,9 @@ function SearchResultsFooter({
           label={l`Load more`}
           color="primary"
           size="small"
-          disabled={!hasNextPage}
           onPress={onLoadMore}>
           <ButtonText>
-            <Trans>{hasNextPage ? 'Load more' : 'Load more'}</Trans>
+            <Trans>Load more</Trans>
           </ButtonText>
         </Button>
       </View>
@@ -453,16 +430,7 @@ let SearchScreenPostResults = ({
               }
             />
           ) : (
-            <EmptyState
-              messageText={<NoResultsText query={query} />}
-              buttonAlign="left"
-              button={{
-                label: l`Load more`,
-                text: l`Load more`,
-                onPress: onEndReached,
-                disabled: isFetchingNextPage,
-              }}
-            />
+            <EmptyState messageText={<NoResultsText query={query} />} />
           )}
         </>
       ) : (
@@ -582,16 +550,7 @@ let SearchScreenUserResults = ({
           }
         />
       ) : (
-        <EmptyState
-          messageText={<NoResultsText query={query} />}
-          buttonAlign="left"
-          button={{
-            label: l`Load more`,
-            text: l`Load more`,
-            onPress: onEndReached,
-            disabled: isFetchingNextPage || !hasSession,
-          }}
-        />
+        <EmptyState messageText={<NoResultsText query={query} />} />
       )}
     </>
   ) : (
diff --git a/src/view/com/composer/ExternalEmbed.tsx b/src/view/com/composer/ExternalEmbed.tsx
index ecd22d7c3..7a5e3f03f 100644
--- a/src/view/com/composer/ExternalEmbed.tsx
+++ b/src/view/com/composer/ExternalEmbed.tsx
@@ -53,7 +53,7 @@ export const ExternalEmbedGif = ({
     <View style={[a.overflow_hidden, t.atoms.border_contrast_medium]}>
       {linkInfo ? (
         <View style={{pointerEvents: 'auto'}}>
-          <ExternalEmbed link={linkInfo} hideAlt />
+          <ExternalEmbed link={linkInfo} hideAlt preview />
         </View>
       ) : error ? (
         <Container style={[a.align_start, a.p_md, a.gap_xs]}>
@@ -113,6 +113,7 @@ export const ExternalEmbedLink = ({
               thumb: data.thumb?.source.path,
             }}
             hideAlt
+            preview
           />
         )
       } else if (data.kind === 'feed') {