diff --git a/packages/grafana-ui/src/components/Card/Card.test.tsx b/packages/grafana-ui/src/components/Card/Card.test.tsx
index 1ceca474bce..a42736a04f6 100644
--- a/packages/grafana-ui/src/components/Card/Card.test.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.test.tsx
@@ -72,5 +72,23 @@ describe('Card', () => {
       expect(screen.getByRole('button', { name: 'Click Me' })).not.toBeDisabled();
       expect(screen.getByRole('button', { name: 'Delete' })).not.toBeDisabled();
     });
+
+    it('Children should be conditional', () => {
+      const shouldNotRender = false;
+      render(
+        <Card heading="Test Heading">
+          <Card.Actions>
+            <Button>Click Me</Button>
+            {shouldNotRender && <Button>Delete</Button>}
+          </Card.Actions>
+          <Card.SecondaryActions>
+            {shouldNotRender && <IconButton name="trash-alt" aria-label="Delete" disabled={false} />}
+          </Card.SecondaryActions>
+        </Card>
+      );
+
+      expect(screen.getByRole('button', { name: 'Click Me' })).not.toBeDisabled();
+      expect(screen.queryByRole('button', { name: 'Delete' })).not.toBeInTheDocument();
+    });
   });
 });
diff --git a/packages/grafana-ui/src/components/Card/Card.tsx b/packages/grafana-ui/src/components/Card/Card.tsx
index a147c8559cf..48011b59112 100644
--- a/packages/grafana-ui/src/components/Card/Card.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.tsx
@@ -243,7 +243,7 @@ const Meta: FC<ChildProps & { separator?: string }> = memo(({ children, styles,
 Meta.displayName = 'Meta';
 
 interface ActionsProps extends ChildProps {
-  children: JSX.Element | JSX.Element[];
+  children?: React.ReactNode;
   variant?: 'primary' | 'secondary';
 }
 
@@ -251,9 +251,9 @@ const BaseActions: FC<ActionsProps> = ({ children, styles, disabled, variant })
   const css = variant === 'primary' ? styles?.actions : styles?.secondaryActions;
   return (
     <div className={css}>
-      {Array.isArray(children)
-        ? React.Children.map(children, (child) => cloneElement(child, { disabled, ...child.props }))
-        : cloneElement(children, { disabled, ...children.props })}
+      {React.Children.map(children, (child) => {
+        return React.isValidElement(child) ? cloneElement(child, { disabled, ...child.props }) : null;
+      })}
     </div>
   );
 };
diff --git a/public/app/features/playlist/PlaylistPage.tsx b/public/app/features/playlist/PlaylistPage.tsx
index 0280ebff4ea..ccaae7c9cd8 100644
--- a/public/app/features/playlist/PlaylistPage.tsx
+++ b/public/app/features/playlist/PlaylistPage.tsx
@@ -51,14 +51,7 @@ export const PlaylistPage: FC<Props> = ({ navModel }) => {
                 Start playlist
               </Button>
               {contextSrv.isEditor && (
-                <LinkButton
-                  key="edit"
-                  variant="secondary"
-                  href={`/playlists/edit/${playlist.id}`}
-                  icon="cog"
-                  disabled
-                  title="Feature temporarily disabled"
-                >
+                <LinkButton key="edit" variant="secondary" href={`/playlists/edit/${playlist.id}`} icon="cog">
                   Edit playlist
                 </LinkButton>
               )}