diff --git a/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx b/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx
index 50fe6a2b06..4c30dce536 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx
@@ -8,6 +8,7 @@ import { formatUnknownError } from 'utils/formatUnknownError';
 import useToast from 'hooks/useToast';
 import type { IChangeRequest } from '../changeRequest.types';
 import {
+    Discard,
     StrategyAddedChange,
     StrategyDeletedChange,
     StrategyEditedChange,
@@ -18,6 +19,7 @@ import {
 } from 'utils/strategyNames';
 import { hasNameField } from '../changeRequest.types';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
+import { useChangeRequestOpen } from '../../../hooks/api/getters/useChangeRequestOpen/useChangeRequestOpen';
 
 interface IChangeRequestProps {
     changeRequest: IChangeRequest;
@@ -91,6 +93,10 @@ export const ChangeRequest: VFC<IChangeRequestProps> = ({
         }
     };
 
+    const showDiscard =
+        !['Cancelled', 'Applied'].includes(changeRequest.state) &&
+        changeRequest.features.flatMap(feature => feature.changes).length > 1;
+
     return (
         <Box>
             {changeRequest.features?.map(featureToggleChange => (
@@ -131,12 +137,34 @@ export const ChangeRequest: VFC<IChangeRequestProps> = ({
                                 {change.action === 'updateEnabled' && (
                                     <ToggleStatusChange
                                         enabled={change.payload.enabled}
-                                        onDiscard={onDiscard(change.id)}
+                                        discard={
+                                            <ConditionallyRender
+                                                condition={showDiscard}
+                                                show={
+                                                    <Discard
+                                                        onDiscard={onDiscard(
+                                                            change.id
+                                                        )}
+                                                    />
+                                                }
+                                            />
+                                        }
                                     />
                                 )}
                                 {change.action === 'addStrategy' && (
                                     <StrategyAddedChange
-                                        onDiscard={onDiscard(change.id)}
+                                        discard={
+                                            <ConditionallyRender
+                                                condition={showDiscard}
+                                                show={
+                                                    <Discard
+                                                        onDiscard={onDiscard(
+                                                            change.id
+                                                        )}
+                                                    />
+                                                }
+                                            />
+                                        }
                                     >
                                         <GetFeatureStrategyIcon
                                             strategyName={change.payload.name}
@@ -149,7 +177,18 @@ export const ChangeRequest: VFC<IChangeRequestProps> = ({
                                 )}
                                 {change.action === 'deleteStrategy' && (
                                     <StrategyDeletedChange
-                                        onDiscard={onDiscard(change.id)}
+                                        discard={
+                                            <ConditionallyRender
+                                                condition={showDiscard}
+                                                show={
+                                                    <Discard
+                                                        onDiscard={onDiscard(
+                                                            change.id
+                                                        )}
+                                                    />
+                                                }
+                                            />
+                                        }
                                     >
                                         {hasNameField(change.payload) && (
                                             <>
@@ -167,7 +206,18 @@ export const ChangeRequest: VFC<IChangeRequestProps> = ({
                                 )}
                                 {change.action === 'updateStrategy' && (
                                     <StrategyEditedChange
-                                        onDiscard={onDiscard(change.id)}
+                                        discard={
+                                            <ConditionallyRender
+                                                condition={showDiscard}
+                                                show={
+                                                    <Discard
+                                                        onDiscard={onDiscard(
+                                                            change.id
+                                                        )}
+                                                    />
+                                                }
+                                            />
+                                        }
                                     >
                                         <GetFeatureStrategyIcon
                                             strategyName={change.payload.name}
diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/StrategyChange.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/StrategyChange.tsx
index 4f3708b1c1..9bd3b03912 100644
--- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/StrategyChange.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/StrategyChange.tsx
@@ -1,5 +1,5 @@
 import { Box, Link, styled, Typography } from '@mui/material';
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 
 interface IStrategyChangeProps {
     onDiscard: () => void;
@@ -16,15 +16,15 @@ const ChangeItemInfo: FC = styled(Box)(({ theme }) => ({
     gap: theme.spacing(1),
 }));
 
-const Discard: FC<IStrategyChangeProps> = ({ onDiscard }) => (
+export const Discard: FC<IStrategyChangeProps> = ({ onDiscard }) => (
     <Box>
         <Link onClick={onDiscard}>Discard</Link>
     </Box>
 );
 
-export const StrategyAddedChange: FC<IStrategyChangeProps> = ({
+export const StrategyAddedChange: FC<{ discard?: ReactNode }> = ({
     children,
-    onDiscard,
+    discard,
 }) => {
     return (
         <ChangeItemWrapper>
@@ -36,14 +36,14 @@ export const StrategyAddedChange: FC<IStrategyChangeProps> = ({
                 </Typography>
                 {children}
             </ChangeItemInfo>
-            <Discard onDiscard={onDiscard} />
+            {discard}
         </ChangeItemWrapper>
     );
 };
 
-export const StrategyEditedChange: FC<IStrategyChangeProps> = ({
+export const StrategyEditedChange: FC<{ discard?: ReactNode }> = ({
     children,
-    onDiscard,
+    discard,
 }) => {
     return (
         <ChangeItemWrapper>
@@ -51,13 +51,13 @@ export const StrategyEditedChange: FC<IStrategyChangeProps> = ({
                 <Typography>Editing strategy:</Typography>
                 {children}
             </ChangeItemInfo>
-            <Discard onDiscard={onDiscard} />
+            {discard}
         </ChangeItemWrapper>
     );
 };
 
-export const StrategyDeletedChange: FC<IStrategyChangeProps> = ({
-    onDiscard,
+export const StrategyDeletedChange: FC<{ discard?: ReactNode }> = ({
+    discard,
     children,
 }) => {
     return (
@@ -68,7 +68,7 @@ export const StrategyDeletedChange: FC<IStrategyChangeProps> = ({
                 </Typography>
                 {children}
             </ChangeItemInfo>
-            <Discard onDiscard={onDiscard} />
+            {discard}
         </ChangeItemWrapper>
     );
 };
diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/ToggleStatusChange.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/ToggleStatusChange.tsx
index 7a1bfa112c..35bd1d40a2 100644
--- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/ToggleStatusChange.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestFeatureToggleChange/ToggleStatusChange.tsx
@@ -1,17 +1,16 @@
-import { VFC } from 'react';
-import { Link, Box } from '@mui/material';
-import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
+import { ReactNode, VFC } from 'react';
+import { Box } from '@mui/material';
 import { Badge } from 'component/common/Badge/Badge';
 import { ChangeItemWrapper } from './StrategyChange';
 
-interface IPlaygroundResultsTable {
+interface IToggleStatusChange {
     enabled: boolean;
-    onDiscard?: () => void;
+    discard?: ReactNode;
 }
 
-export const ToggleStatusChange: VFC<IPlaygroundResultsTable> = ({
+export const ToggleStatusChange: VFC<IToggleStatusChange> = ({
     enabled,
-    onDiscard,
+    discard,
 }) => {
     return (
         <ChangeItemWrapper>
@@ -21,14 +20,7 @@ export const ToggleStatusChange: VFC<IPlaygroundResultsTable> = ({
                     {enabled ? ' Enabled' : 'Disabled'}
                 </Badge>
             </Box>
-            <ConditionallyRender
-                condition={Boolean(onDiscard)}
-                show={
-                    <Box>
-                        <Link onClick={onDiscard}>Discard</Link>
-                    </Box>
-                }
-            />
+            {discard}
         </ChangeItemWrapper>
     );
 };
diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx
index 6fceea9ad8..1277e4b781 100644
--- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx
@@ -133,7 +133,10 @@ export const ChangeRequestOverview: FC = () => {
                 <StyledPaper elevation={0}>
                     <StyledInnerContainer>
                         Changes
-                        <ChangeRequest changeRequest={changeRequest} />
+                        <ChangeRequest
+                            changeRequest={changeRequest}
+                            onRefetch={refetchChangeRequest}
+                        />
                         {changeRequest.comments?.map(comment => (
                             <ChangeRequestComment
                                 key={comment.id}