2 files changed, 11 insertions, 19 deletions
diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx
index c7cae9889d..f8617234aa 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/Support.tsx
@@ -94,25 +94,15 @@ export default class Support extends Component<ISupportProps, ISupportState> {
   };
 
   public onSend = async (): Promise<void> => {
-    switch (this.state.sendState) {
-      case SendState.Initial:
-        if (this.state.email.length === 0) {
-          this.setState({ sendState: SendState.Confirm });
-          break;
-        } else {
-          // fallthrough
-        }
-
-      case SendState.Confirm:
-        try {
-          await this.sendReport();
-        } catch (error) {
-          // No-op
-        }
-        break;
-
-      default:
-        break;
+    const sendState = this.state.sendState;
+    if (sendState === SendState.Initial && this.state.email.length === 0) {
+      this.setState({ sendState: SendState.Confirm });
+    } else if (sendState === SendState.Initial || sendState === SendState.Confirm) {
+      try {
+        await this.sendReport();
+      } catch (error) {
+        // No-op
+      }
     }
   };
 
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index dacdfcdc72..75730c85b7 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -234,6 +234,8 @@ export default class WireguardKeys extends Component<IProps> {
               {messages.pgettext('wireguard-key-view', 'Key verification failed')}
             </Text>
           );
+        } else {
+          return null;
         }
 
       default: