diff --git a/public/locales/en-GB/app.json b/public/locales/en-GB/app.json
index 938e4ff7..b2bfc56d 100644
--- a/public/locales/en-GB/app.json
+++ b/public/locales/en-GB/app.json
@@ -11,7 +11,8 @@
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Create an account</0> Or <2>Access as a guest</2>",
   "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>",
-  "<0>Oops, something's gone wrong.</0><1>Submitting debug logs will help us track down the problem.</1>": "<0>Oops, something's gone wrong.</0><1>Submitting debug logs will help us track down the problem.</1>",
+  "<0>Oops, something's gone wrong.</0>": "<0>Oops, something's gone wrong.</0>",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Submitting debug logs will help us track down the problem.</0>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>",
   "Accept camera/microphone permissions to join the call.": "Accept camera/microphone permissions to join the call.",
   "Accept microphone permissions to join the call.": "Accept microphone permissions to join the call.",
diff --git a/src/FullScreenView.tsx b/src/FullScreenView.tsx
index 4d4739c4..d3a1caf8 100644
--- a/src/FullScreenView.tsx
+++ b/src/FullScreenView.tsx
@@ -9,6 +9,7 @@ import { useSubmitRageshake } from "./settings/submit-rageshake";
 import { ErrorMessage } from "./input/Input";
 import styles from "./FullScreenView.module.css";
 import { translatedError, TranslatedError } from "./TranslatedError";
+import { Config } from "./config/Config";
 
 interface FullScreenViewProps {
   className?: string;
@@ -98,7 +99,7 @@ export function CrashView() {
     logsComponent = <div>{t("Thanks! We'll get right on it.")}</div>;
   } else if (sending) {
     logsComponent = <div>{t("Sending…")}</div>;
-  } else {
+  } else if (Config.get().rageshake?.submit_url) {
     logsComponent = (
       <Button
         size="lg"
@@ -115,8 +116,13 @@ export function CrashView() {
     <FullScreenView>
       <Trans>
         <h1>Oops, something's gone wrong.</h1>
-        <p>Submitting debug logs will help us track down the problem.</p>
       </Trans>
+      {Config.get().rageshake?.submit_url && (
+        <Trans>
+          <p>Submitting debug logs will help us track down the problem.</p>
+        </Trans>
+      )}
+
       <div className={styles.sendLogsSection}>{logsComponent}</div>
       {error && (
         <ErrorMessage error={translatedError("Couldn't send debug logs!", t)} />
diff --git a/src/room/OverflowMenu.tsx b/src/room/OverflowMenu.tsx
index fc726b63..3b7ebce6 100644
--- a/src/room/OverflowMenu.tsx
+++ b/src/room/OverflowMenu.tsx
@@ -32,6 +32,7 @@ import { SettingsModal } from "../settings/SettingsModal";
 import { InviteModal } from "./InviteModal";
 import { TooltipTrigger } from "../Tooltip";
 import { FeedbackModal } from "./FeedbackModal";
+import { Config } from "../config/Config";
 
 interface Props {
   roomIdOrAlias: string;
@@ -117,10 +118,12 @@ export function OverflowMenu({
               <SettingsIcon />
               <span>{t("Settings")}</span>
             </Item>
-            <Item key="feedback" textValue={t("Submit feedback")}>
-              <FeedbackIcon />
-              <span>{t("Submit feedback")}</span>
-            </Item>
+            {Config.get().rageshake?.submit_url && (
+              <Item key="feedback" textValue={t("Submit feedback")}>
+                <FeedbackIcon />
+                <span>{t("Submit feedback")}</span>
+              </Item>
+            )}
           </Menu>
         )}
       </PopoverMenuTrigger>