diff --git a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx
index 9b6d15c661..cfa18a43ef 100644
--- a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx
+++ b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx
@@ -58,13 +58,13 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) {
                 one="You do not have permission to cancel the following job:"
                 other="You do not have permission to cancel the following jobs:"
               />
-              {cannotCancelPermissions.map((job, i) =>
-                i === cannotCancelPermissions.length - 1 ? (
-                  <strong> {job}</strong>
-                ) : (
-                  <strong> {job},</strong>
-                )
-              )}
+              {cannotCancelPermissions.map((job, i) => (
+                <strong key={job}>
+                  {' '}
+                  {job}
+                  {i !== cannotCancelPermissions.length - 1 ? ',' : ''}
+                </strong>
+              ))}
             </div>
           )}
           {cannotCancelNotRunning.length > 0 && (
@@ -74,13 +74,13 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) {
                 one="You cannot cancel the following job because it is not running:"
                 other="You cannot cancel the following jobs because they are not running:"
               />
-              {cannotCancelNotRunning.map((job, i) =>
-                i === cannotCancelNotRunning.length - 1 ? (
-                  <strong> {job}</strong>
-                ) : (
-                  <strong> {job},</strong>
-                )
-              )}
+              {cannotCancelNotRunning.map((job, i) => (
+                <strong key={job}>
+                  {' '}
+                  {job}
+                  {i !== cannotCancelNotRunning.length - 1 ? ',' : ''}
+                </strong>
+              ))}
             </div>
           )}
         </div>
diff --git a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx
index c241e5b201..1e6bd30f1e 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx
@@ -82,9 +82,9 @@ function ScheduleListItem({
         {Boolean(isMissingInventory || isMissingSurvey) && (
           <span>
             <Tooltip
-              content={[isMissingInventory, isMissingSurvey].map(message => (
-                <div key={message}>{message}</div>
-              ))}
+              content={[isMissingInventory, isMissingSurvey].map(message =>
+                message ? <div key={message}>{message}</div> : null
+              )}
               position="right"
             >
               <ExclamationTriangleIcon />