diff --git a/frontend/src/app/(user-area)/dashboard/InitialTeamSetup.tsx b/frontend/src/app/(user-area)/dashboard/InitialTeamSetup.tsx
index c47ccc52..198b35b3 100644
--- a/frontend/src/app/(user-area)/dashboard/InitialTeamSetup.tsx
+++ b/frontend/src/app/(user-area)/dashboard/InitialTeamSetup.tsx
@@ -49,7 +49,7 @@ const JoinTeamForm = () => {
                       ? "You currently have no team invites. If you'd like to join an existing team, ask a team administrator to invite you."
                       : `You have ${invites.length} team invite${invites.length === 1 ? '' : 's'}:`}
             </p>
-            {invites?.length && (
+            {invites?.length ? (
                 <table className="w-full text-left">
                     <thead className="uppercase text-english-violet">
                         <tr>
@@ -78,7 +78,7 @@ const JoinTeamForm = () => {
                         ))}
                     </tbody>
                 </table>
-            )}
+            ) : null}
         </>
     );
 };
diff --git a/frontend/src/app/(user-area)/teams/[teamId]/page.tsx b/frontend/src/app/(user-area)/teams/[teamId]/page.tsx
index 8660365d..0990d25f 100644
--- a/frontend/src/app/(user-area)/teams/[teamId]/page.tsx
+++ b/frontend/src/app/(user-area)/teams/[teamId]/page.tsx
@@ -376,7 +376,7 @@ const Page = () => {
                                             Go to your team&apos;s{' '}
                                             <Link href={`/teams/${teamId}/settings/integrations`} className="link">
                                                 integration settings
-                                            </Link>
+                                            </Link>{' '}
                                             to configure ingestion from your AWS account.
                                         </p>
                                     </>
diff --git a/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx b/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
index bf997b92..4930ff3a 100644
--- a/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
+++ b/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
@@ -44,10 +44,12 @@ const CreateIntegrationForm = (props: CreateIntegrationFormProps) => {
                 input: {
                     name,
                     roleArn,
-                    cloudtrailTrail: {
-                        s3BucketName,
-                        s3KeyPrefix,
-                    },
+                    cloudtrailTrail: s3BucketName
+                        ? {
+                              s3BucketName,
+                              s3KeyPrefix,
+                          }
+                        : undefined,
                     getAccountNamesFromOrganizations,
                     manageScps,
                     queueReportGeneration,