diff --git a/preload.js b/preload.js
index 92485ce07..acdffba11 100644
--- a/preload.js
+++ b/preload.js
@@ -97,6 +97,7 @@ window.CONSTANTS = {
   // Max attachment size: 10 MB
   MAX_ATTACHMENT_FILESIZE: 10000000,
   NOTIFICATION_ENABLE_TIMEOUT_SECONDS: 10, // number of seconds to turn on notifications after reconnect/start of app
+  ARCHIVING_ENABLED: false,
 };
 
 window.versionInfo = {
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 5facdbf8e..24dce77ab 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -38,7 +38,7 @@ interface Props {
   isMe: boolean;
   isClosable?: boolean;
   isGroup: boolean;
-  isArchived: boolean;
+  isArchived?: boolean;
   isPublic: boolean;
   isRss: boolean;
   amMod: boolean;
@@ -74,7 +74,7 @@ interface Props {
   onCloseOverlay: () => void;
   onDeleteSelectedMessages: () => void;
 
-  onArchive: () => void;
+  onArchive?: () => void;
   onMoveToInbox: () => void;
 
   onShowSafetyNumber: () => void;
@@ -498,16 +498,17 @@ export class ConversationHeader extends React.Component<Props> {
     //   hasNickname && (
     //     <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
     //   );
-    const archiveConversationMenuItem = isArchived ? (
+    const archiveConversationMenuItem = window.CONSTANTS.ARCHIVING_ENABLED
+      && (isArchived ? (
       <MenuItem onClick={onMoveToInbox}>
         {i18n('moveConversationToInbox')}
       </MenuItem>
     ) : (
       <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
-    );
+    ));
 
     return (
-      <React.Fragment>
+      <>
         {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
         {disappearingMessagesMenuItem}
         {showMembersMenuItem}
@@ -517,7 +518,7 @@ export class ConversationHeader extends React.Component<Props> {
         {/* {changeNicknameMenuItem}
         {clearNicknameMenuItem} */}
         {archiveConversationMenuItem}
-      </React.Fragment>
+      </>
     );
   }
 }