diff --git a/renderer/components/kap-app.tsx b/renderer/components/kap-app.tsx
new file mode 100644
index 00000000..05930a0e
--- /dev/null
+++ b/renderer/components/kap-app.tsx
@@ -0,0 +1,25 @@
+import {AppProps} from 'next/app';
+import classNames from 'classnames';
+
+import useDarkMode from '../hooks/dark-mode';
+import GlobalStyles from '../utils/global-styles';
+import SentryErrorBoundary from '../utils/sentry-error-boundary';
+import {WindowStateProvider} from '../hooks/window-state';
+
+const KapApp = ({Component, pageProps}: AppProps) => {
+  const isDarkMode = useDarkMode();
+  const className = classNames('cover-window', {dark: isDarkMode});
+
+  return (
+    <div className={className}>
+      <SentryErrorBoundary>
+        <WindowStateProvider>
+          <Component {...pageProps}/>
+          <GlobalStyles/>
+        </WindowStateProvider>
+      </SentryErrorBoundary>
+    </div>
+  );
+};
+
+export default KapApp;
diff --git a/renderer/next.config.js b/renderer/next.config.js
index 67e3d827..6aa4bd31 100644
--- a/renderer/next.config.js
+++ b/renderer/next.config.js
@@ -12,7 +12,9 @@ module.exports = (nextConfig) => {
         ]
       });
 
-      config.target = 'electron-renderer';
+      if (!options.isServer) {
+        config.target = 'electron-renderer';
+      }
       config.devtool = 'cheap-module-source-map';
 
       if (typeof nextConfig.webpack === 'function') {
diff --git a/renderer/pages/_app.tsx b/renderer/pages/_app.tsx
index 3023fe93..c370afce 100644
--- a/renderer/pages/_app.tsx
+++ b/renderer/pages/_app.tsx
@@ -1,39 +1,8 @@
 import {AppProps} from 'next/app';
-import {useState, useEffect} from 'react';
-import useDarkMode from '../hooks/dark-mode';
-import GlobalStyles from '../utils/global-styles';
-import SentryErrorBoundary from '../utils/sentry-error-boundary';
-import {WindowStateProvider} from '../hooks/window-state';
-import classNames from 'classnames';
+import dynamic from 'next/dynamic';
 
-const Kap = (props: AppProps) => {
-  const [isMounted, setIsMounted] = useState(false);
-
-  useEffect(() => {
-    setIsMounted(true);
-  }, []);
-
-  if (!isMounted) {
-    return null;
-  }
-
-  return <MainApp {...props}/>;
-};
-
-const MainApp = ({Component, pageProps}: AppProps) => {
-  const isDarkMode = useDarkMode();
-  const className = classNames('cover-window', {dark: isDarkMode});
-
-  return (
-    <div className={className}>
-      <SentryErrorBoundary>
-        <WindowStateProvider>
-          <Component {...pageProps}/>
-          <GlobalStyles/>
-        </WindowStateProvider>
-      </SentryErrorBoundary>
-    </div>
-  );
-};
+const Kap = dynamic<AppProps>(async () => import('../components/kap-app'), {
+  ssr: false
+});
 
 export default Kap;