diff --git a/app/soapbox/features/groups/index.tsx b/app/soapbox/features/groups/index.tsx
index c29ac39d4..ce84d1c1e 100644
--- a/app/soapbox/features/groups/index.tsx
+++ b/app/soapbox/features/groups/index.tsx
@@ -70,13 +70,13 @@ const Groups: React.FC = () => {
       scrollKey='groups'
       emptyMessage={emptyMessage}
       itemClassName='py-3 last:pb-0'
-      isLoading
-      showLoading
+      isLoading={isLoading}
+      showLoading={isLoading && !groups.count()}
       placeholderComponent={PlaceholderGroupCard}
       placeholderCount={3}
     >
       {groups.map((group) => (
-        <Link to={`/groups/${group.id}`}>
+        <Link key={group.id} to={`/groups/${group.id}`}>
           <GroupCard group={group as GroupEntity} />
         </Link>
       ))}
diff --git a/app/soapbox/features/ui/components/link-footer.tsx b/app/soapbox/features/ui/components/link-footer.tsx
index bc1c67fd3..c676c1be5 100644
--- a/app/soapbox/features/ui/components/link-footer.tsx
+++ b/app/soapbox/features/ui/components/link-footer.tsx
@@ -76,7 +76,7 @@ const LinkFooter: React.FC = (): JSX.Element => {
             defaultMessage='{code_name} is open source software. You can contribute or report issues at {code_link} (v{code_version}).'
             values={{
               code_name: sourceCode.displayName,
-              code_link: <Text theme='subtle'><a className='underline' href={sourceCode.url} rel='noopener' target='_blank'>{sourceCode.repository}</a></Text>,
+              code_link: <Text theme='subtle' tag='span'><a className='underline' href={sourceCode.url} rel='noopener' target='_blank'>{sourceCode.repository}</a></Text>,
               code_version: sourceCode.version,
             }}
           />