diff --git a/ts/components/session/SessionConfirm.tsx b/ts/components/session/SessionConfirm.tsx
index 9296475ab..bd51938ea 100644
--- a/ts/components/session/SessionConfirm.tsx
+++ b/ts/components/session/SessionConfirm.tsx
@@ -115,11 +115,9 @@ const SessionConfirmInner = (props: SessionConfirmDialogProps) => {
       </div>
 
       <div className="session-modal__button-group">
-        {/* <SessionButton text={okText} buttonColor={okTheme} onClick={closeAfterClickOk ? onClickOk : onClickOkWithClose} /> */}
         <SessionButton text={okText} buttonColor={okTheme} onClick={onClickOkHandler} />
 
         {!hideCancel && (
-          // <SessionButton text={cancelText} buttonColor={closeTheme} onClick={onClickClose} />
           <SessionButton
             text={cancelText}
             buttonColor={closeTheme}
diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx
index edc74f66b..ddc15e74b 100644
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@@ -41,6 +41,8 @@ import { getMentionsInput } from '../../../state/selectors/mentionsInput';
 import { useDispatch } from 'react-redux';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
 import { SessionButtonColor } from '../SessionButton';
+import { any } from 'underscore';
+import { SessionConfirmDialogProps } from '../SessionConfirm';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -91,6 +93,7 @@ interface Props {
   showLeftPaneSection: (section: SectionType) => void;
   showSettingsSection: (category: SessionSettingCategory) => void;
   theme: DefaultTheme;
+  updateConfirmModal: (props: SessionConfirmDialogProps) => any;
 }
 
 interface State {
@@ -235,6 +238,12 @@ export class SessionCompositionBox extends React.Component<Props, State> {
             //   message: window.i18n('linkPreviewsConfirmMessage'),
             //   okTheme: SessionButtonColor.Danger,
             // }))
+            this.props.updateConfirmModal({
+              shouldShowConfirm: () => !window.getSettingValue('link-preview-setting'),
+              title: window.i18n('linkPreviewsTitle'),
+              message: window.i18n('linkPreviewsConfirmMessage'),
+              okTheme: SessionButtonColor.Danger,
+            })
           }
 
       }
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index c17cf2b93..702e062f7 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -43,8 +43,6 @@ import { AddModeratorsDialog } from '../../conversation/ModeratorsAddDialog';
 import { RemoveModeratorsDialog } from '../../conversation/ModeratorsRemoveDialog';
 import { UpdateGroupNameDialog } from '../../conversation/UpdateGroupNameDialog';
 import { UpdateGroupMembersDialog } from '../../conversation/UpdateGroupMembersDialog';
-import { getOurNumber } from '../../../state/selectors/user';
-import { useSelector } from 'react-redux';
 import { InviteContactsDialog } from '../../conversation/InviteContactsDialog';
 
 interface State {
@@ -314,6 +312,7 @@ export class SessionConversation extends React.Component<Props, State> {
             removeAttachment={this.removeAttachment}
             onChoseAttachments={this.onChoseAttachments}
             theme={this.props.theme}
+            updateConfirmModal={actions.updateConfirmModal}
           />
         </div>