diff --git a/src/initializer.tsx b/src/initializer.tsx
index bdde17ed..4358f02b 100644
--- a/src/initializer.tsx
+++ b/src/initializer.tsx
@@ -191,17 +191,24 @@ export class Initializer {
       this.loadStates.sentry === LoadState.None &&
       this.loadStates.config === LoadState.Loaded
     ) {
-      Sentry.init({
-        dsn: Config.instance.config.sentry?.DSN,
-        environment: Config.instance.config.sentry?.environment,
-        integrations: [
-          new Integrations.BrowserTracing({
-            routingInstrumentation:
-              Sentry.reactRouterV5Instrumentation(history),
-          }),
-        ],
-        tracesSampleRate: 1.0,
-      });
+      if (
+        Config.instance.config.sentry?.DSN &&
+        Config.instance.config.sentry?.environment
+      ) {
+        Sentry.init({
+          dsn: Config.instance.config.sentry?.DSN,
+          environment: Config.instance.config.sentry?.environment,
+          integrations: [
+            new Integrations.BrowserTracing({
+              routingInstrumentation:
+                Sentry.reactRouterV5Instrumentation(history),
+            }),
+          ],
+          tracesSampleRate: 1.0,
+        });
+      }
+      // Sentry is now 'loadeed' (even if we actually skipped starting
+      // it due to to not being configured)
       this.loadStates.sentry = LoadState.Loaded;
     }
 
diff --git a/src/settings/submit-rageshake.ts b/src/settings/submit-rageshake.ts
index b8064d85..6c8e68f2 100644
--- a/src/settings/submit-rageshake.ts
+++ b/src/settings/submit-rageshake.ts
@@ -54,6 +54,10 @@ export function useSubmitRageshake(): {
 
   const submitRageshake = useCallback(
     async (opts) => {
+      if (!Config.instance.config.rageshake?.submit_url) {
+        throw new Error("No rageshake URL is configured");
+      }
+
       if (sending) {
         return;
       }
@@ -258,14 +262,10 @@ export function useSubmitRageshake(): {
           );
         }
 
-        await fetch(
-          Config.instance.config.rageshake?.submit_url ??
-            DEFAULT_CONFIG.rageshake.submit_url,
-          {
-            method: "POST",
-            body,
-          }
-        );
+        await fetch(Config.instance.config.rageshake?.submit_url, {
+          method: "POST",
+          body,
+        });
 
         setState({ sending: false, sent: true, error: null });
       } catch (error) {