diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx
index 751e460a1..321ddecb8 100644
--- a/ts/components/AboutView.tsx
+++ b/ts/components/AboutView.tsx
@@ -40,13 +40,14 @@ const StyledContent = styled(Flex)`
 
 export const AboutView = () => {
   // Add debugging metadata - environment if not production, app instance name
-  const states = [];
+  const environmentStates = [];
 
   if (window.getEnvironment() !== 'production') {
-    states.push(window.getEnvironment());
+    environmentStates.push(window.getEnvironment());
   }
+
   if (window.getAppInstance()) {
-    states.push(window.getAppInstance());
+    environmentStates.push(window.getAppInstance());
   }
 
   const versionInfo = `v${window.getVersion()}`;
@@ -63,7 +64,7 @@ export const AboutView = () => {
   }, []);
 
   return (
-    <SessionTheme>
+    <SessionTheme runSetup={false}>
       <SessionToastContainer />
       <StyledContent
         container={true}
@@ -83,7 +84,6 @@ export const AboutView = () => {
           width={192}
           height={26}
         />
-
         <CopyToClipboardButton
           className="version"
           text={versionInfo}
@@ -95,11 +95,13 @@ export const AboutView = () => {
           buttonType={SessionButtonType.Simple}
         />
         <CopyToClipboardButton className="os" text={osInfo} buttonType={SessionButtonType.Simple} />
-        <CopyToClipboardButton
-          className="environment"
-          text={states.join(' - ')}
-          buttonType={SessionButtonType.Simple}
-        />
+        {environmentStates.length ? (
+          <CopyToClipboardButton
+            className="environment"
+            text={environmentStates.join(' - ')}
+            buttonType={SessionButtonType.Simple}
+          />
+        ) : null}
         <a href="https://getsession.org">https://getsession.org</a>
         <br />
         <a className="privacy" href="https://getsession.org/privacy-policy">