diff --git a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-desktop-action-dialog-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-desktop-action-dialog-1-snap.png
index df71a81de1..7a36fcb06c 100644
Binary files a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-desktop-action-dialog-1-snap.png and b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-desktop-action-dialog-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-mobile-ios-action-dialog-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-mobile-ios-action-dialog-1-snap.png
index 7dc9bb3b01..21705c512f 100644
Binary files a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-mobile-ios-action-dialog-1-snap.png and b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-device-mobile-ios-action-dialog-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-optional-elements-are-not-displayed-if-not-provided-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-optional-elements-are-not-displayed-if-not-provided-1-snap.png
new file mode 100644
index 0000000000..18dea849e7
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-dialog-optional-elements-are-not-displayed-if-not-provided-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-select-options-are-correctly-positioned-inside-a-dialog-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-select-options-are-correctly-positioned-inside-a-dialog-1-snap.png
index c61c70f83a..b0214daf68 100644
Binary files a/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-select-options-are-correctly-positioned-inside-a-dialog-1-snap.png and b/src/__screenshot_tests__/__image_snapshots__/dialog-screenshot-test-tsx-select-options-are-correctly-positioned-inside-a-dialog-1-snap.png differ
diff --git a/src/__screenshot_tests__/dialog-screenshot-test.tsx b/src/__screenshot_tests__/dialog-screenshot-test.tsx
index 67c3d1402c..3ab5e8da45 100644
--- a/src/__screenshot_tests__/dialog-screenshot-test.tsx
+++ b/src/__screenshot_tests__/dialog-screenshot-test.tsx
@@ -40,3 +40,26 @@ test('Select options are correctly positioned inside a dialog', async () => {
     const image = await page.screenshot({fullPage: true});
     expect(image).toMatchImageSnapshot();
 });
+
+test('Dialog optional elements are not displayed if not provided', async () => {
+    const page = await openStoryPage({
+        id: 'components-modals--dialog',
+        device: 'DESKTOP',
+        args: {
+            message: 'Message',
+            title: '',
+            subtitle: '',
+            onAccept: false,
+            onCancel: false,
+            link: false,
+            icon: false,
+            extra: false,
+        },
+    });
+
+    await (await screen.findByRole('button', {name: 'Open'})).click();
+    await screen.findByRole('dialog');
+
+    const image = await page.screenshot({fullPage: true});
+    expect(image).toMatchImageSnapshot();
+});
diff --git a/src/__stories__/dialog-story.tsx b/src/__stories__/dialog-story.tsx
index 7f81333edb..aef4bcfaae 100644
--- a/src/__stories__/dialog-story.tsx
+++ b/src/__stories__/dialog-story.tsx
@@ -63,7 +63,35 @@ export const Confirm: StoryComponent<{destructive: boolean}> = ({destructive}) =
     );
 };
 
-export const Dialog: StoryComponent = () => {
+Confirm.args = {
+    destructive: false,
+};
+
+type DialogArgs = {
+    title: string;
+    subtitle: string;
+    message: string;
+    acceptText: string;
+    cancelText: string;
+    onAccept: boolean;
+    onCancel: boolean;
+    link: boolean;
+    icon: boolean;
+    extra: boolean;
+};
+
+export const Dialog: StoryComponent<DialogArgs> = ({
+    onAccept,
+    onCancel,
+    link,
+    icon,
+    extra,
+    title,
+    subtitle,
+    message,
+    acceptText,
+    cancelText,
+}) => {
     const {dialog} = useDialog();
     return (
         <ButtonLayout
@@ -72,11 +100,12 @@ export const Dialog: StoryComponent = () => {
                     aria-haspopup="dialog"
                     onPress={() =>
                         dialog({
-                            title: 'Title',
-                            subtitle: 'Subtitle',
-                            message: 'Message',
-                            acceptText: 'Accept terms and conditions',
-                            extra: (
+                            title,
+                            subtitle,
+                            message,
+                            acceptText,
+                            cancelText,
+                            extra: extra ? (
                                 <Stack space={16}>
                                     <Text1 regular>Extra content</Text1>
                                     <Select
@@ -89,11 +118,13 @@ export const Dialog: StoryComponent = () => {
                                         ]}
                                     />
                                 </Stack>
-                            ),
-                            link: <ButtonLink href="https://google.com">Link</ButtonLink>,
-                            icon: <IconInformationUserLight color={skinVars.colors.brand} />,
-                            onAccept: () => console.log('Accepted'),
-                            onCancel: () => console.log('Canceled'),
+                            ) : undefined,
+                            link: link ? <ButtonLink href="https://google.com">Link</ButtonLink> : undefined,
+                            icon: icon ? (
+                                <IconInformationUserLight color={skinVars.colors.brand} />
+                            ) : undefined,
+                            onAccept: onAccept ? () => console.log('Accepted') : undefined,
+                            onCancel: onCancel ? () => console.log('Canceled') : undefined,
                         })
                     }
                 >
@@ -104,6 +135,15 @@ export const Dialog: StoryComponent = () => {
     );
 };
 
-Confirm.args = {
-    destructive: false,
+Dialog.args = {
+    title: 'Title',
+    subtitle: 'Subtitle',
+    message: 'Message',
+    acceptText: 'Accept terms and conditions',
+    cancelText: 'Cancel',
+    onAccept: true,
+    onCancel: true,
+    link: true,
+    icon: true,
+    extra: true,
 };
diff --git a/src/dialog.tsx b/src/dialog.tsx
index 6c556a5789..726f79ae86 100644
--- a/src/dialog.tsx
+++ b/src/dialog.tsx
@@ -58,7 +58,9 @@ export type DialogProps = ExclusifyUnion<AlertProps | ConfirmProps | ExtendedDia
     type: 'dialog' | 'alert' | 'confirm';
 };
 
-const Dialog: React.FC<DialogProps> = (props) => {
+type InternalDialogProps = DialogProps & {showCancelButton: boolean; showAcceptButton: boolean};
+
+const InternalDialog: React.FC<InternalDialogProps> = (props) => {
     const {texts} = useTheme();
     const {
         className,
@@ -66,6 +68,8 @@ const Dialog: React.FC<DialogProps> = (props) => {
         message,
         icon,
         extra,
+        showCancelButton,
+        showAcceptButton,
         cancelText = texts.dialogCancelButton,
         acceptText = texts.dialogAcceptButton,
         onCancel: handleCancel,
@@ -73,7 +77,7 @@ const Dialog: React.FC<DialogProps> = (props) => {
         destructive = false,
     } = props;
     const isDialog = props.type === 'dialog';
-    const showCancelButton = props.type === 'confirm' || (isDialog && !!handleCancel);
+    const showActions = (isDialog && !!props.link) || showAcceptButton || showCancelButton;
 
     const acceptButtonProps = {
         onPress: handleAccept || (() => {}),
@@ -116,33 +120,37 @@ const Dialog: React.FC<DialogProps> = (props) => {
                 </Stack>
             </div>
 
-            <div className={styles.dialogActions}>
-                <ButtonLayout
-                    link={isDialog ? props.link : undefined}
-                    primaryButton={
-                        destructive ? (
-                            <ButtonDanger
-                                tabIndex={1} // eslint-disable-line jsx-a11y/tabindex-no-positive
-                                {...acceptButtonProps}
-                            />
-                        ) : (
-                            <ButtonPrimary tabIndex={1} {...acceptButtonProps} /> // eslint-disable-line jsx-a11y/tabindex-no-positive
-                        )
-                    }
-                    secondaryButton={
-                        showCancelButton ? (
-                            <ButtonSecondary
-                                tabIndex={2} // eslint-disable-line jsx-a11y/tabindex-no-positive
-                                onPress={handleCancel || (() => {})}
-                                // @deprecated - testid should be removed but many webapp tests depend on this
-                                dataAttributes={{testid: 'dialog-cancel-button'}}
-                            >
-                                {cancelText}
-                            </ButtonSecondary>
-                        ) : undefined
-                    }
-                />
-            </div>
+            {showActions && (
+                <div className={styles.dialogActions}>
+                    <ButtonLayout
+                        link={isDialog ? props.link : undefined}
+                        primaryButton={
+                            showAcceptButton ? (
+                                destructive ? (
+                                    <ButtonDanger
+                                        tabIndex={1} // eslint-disable-line jsx-a11y/tabindex-no-positive
+                                        {...acceptButtonProps}
+                                    />
+                                ) : (
+                                    <ButtonPrimary tabIndex={1} {...acceptButtonProps} /> // eslint-disable-line jsx-a11y/tabindex-no-positive
+                                )
+                            ) : undefined
+                        }
+                        secondaryButton={
+                            showCancelButton ? (
+                                <ButtonSecondary
+                                    tabIndex={2} // eslint-disable-line jsx-a11y/tabindex-no-positive
+                                    onPress={handleCancel || (() => {})}
+                                    // @deprecated - testid should be removed but many webapp tests depend on this
+                                    dataAttributes={{testid: 'dialog-cancel-button'}}
+                                >
+                                    {cancelText}
+                                </ButtonSecondary>
+                            ) : undefined
+                        }
+                    />
+                </div>
+            )}
         </div>
     );
 };
@@ -384,7 +392,17 @@ const ModalDialog = (props: ModalDialogProps): JSX.Element => {
                                     />
                                 </div>
                             )}
-                            <Dialog {...dialogProps} onCancel={handleCancel} onAccept={handleAccept} />
+                            <InternalDialog
+                                {...dialogProps}
+                                // "alert" and "confirm" always show the accept button, "dialog" only when the callback is provided
+                                showAcceptButton={props.type !== 'dialog' || !!props.onAccept}
+                                // "alert" never shows the cancel button, "confirm" always shows it, "dialog" only when the callback is provided
+                                showCancelButton={
+                                    props.type === 'confirm' || (props.type === 'dialog' && !!props.onCancel)
+                                }
+                                onCancel={handleCancel}
+                                onAccept={handleAccept}
+                            />
                         </div>
                     </div>
                 </div>