diff --git a/ts/components/OnionStatusDialog.tsx b/ts/components/OnionStatusDialog.tsx
index 776e3dd17..7d3b250e5 100644
--- a/ts/components/OnionStatusDialog.tsx
+++ b/ts/components/OnionStatusDialog.tsx
@@ -26,6 +26,7 @@ import {
 
 // tslint:disable-next-line: no-submodule-imports
 import useNetworkState from 'react-use/lib/useNetworkState';
+import { SessionSpinner } from './session/SessionSpinner';
 
 export type StatusLightType = {
   glowStartDelay: number;
@@ -38,6 +39,10 @@ const OnionPathModalInner = () => {
   // including the device and destination in calculation
   const glowDuration = onionPath.length + 2;
 
+  if (!onionPath) {
+    return <SessionSpinner loading={true} />
+  }
+
   const nodes = [
     {
       label: window.i18n('device'),