2 files changed, 4 insertions, 5 deletions

diff --git a/src/components/auth/SetupAssistant.tsx b/src/components/auth/SetupAssistant.tsx
index fdcbba45e..c25495471 100644
--- a/src/components/auth/SetupAssistant.tsx
+++ b/src/components/auth/SetupAssistant.tsx
@@ -39,10 +39,9 @@ const messages = defineMessages({
   },
 });
 
-const transition =
-  window && window.matchMedia('(prefers-reduced-motion: no-preference)')
-    ? 'all 0.25s'
-    : 'none';
+const transition = window?.matchMedia('(prefers-reduced-motion: no-preference)')
+  ? 'all 0.25s'
+  : 'none';
 
 const styles = theme => ({
   root: {
diff --git a/src/components/auth/Welcome.tsx b/src/components/auth/Welcome.tsx
index 259e3c335..c1a2db386 100644
--- a/src/components/auth/Welcome.tsx
+++ b/src/components/auth/Welcome.tsx
@@ -91,8 +91,8 @@ class Welcome extends Component<IProps> {
             className="settings__hr-sections"
             style={{ marginTop: 24, marginBottom: 24, borderStyle: 'solid' }}
           />
-          {/* eslint-disable-next-line react/button-has-type */}
           <button
+            type="button"
             className="button"
             onClick={this.useLocalServer.bind(this)}
             onKeyDown={noop}