diff --git a/app.vue b/app.vue
index 2599eb4f..a14e8a1a 100644
--- a/app.vue
+++ b/app.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 setupI18n()
-setupLogging()
 setupPageHeader()
 provideGlobalCommands()
 
diff --git a/composables/log.ts b/composables/log.ts
deleted file mode 100644
index b3db4ef5..00000000
--- a/composables/log.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as log from 'tauri-plugin-log-api'
-
-// When running inside Tauri, catch all logs from 3rd party packages and direct them to the unified logging stream
-export function setupLogging() {
-  if (import.meta.env.TAURI_PLATFORM) {
-    // eslint-disable-next-line no-global-assign
-    console = {
-      ...console,
-      trace: log.trace,
-      debug: log.debug,
-      log: log.info,
-      warn: log.warn,
-      error: log.error,
-    }
-
-    window.addEventListener('unhandledrejection', err =>
-      log.error(err.reason),
-    )
-    window.addEventListener('error', err => log.error(err.error), true)
-  }
-}
diff --git a/modules/tauri/index.ts b/modules/tauri/index.ts
new file mode 100644
index 00000000..94c0b40d
--- /dev/null
+++ b/modules/tauri/index.ts
@@ -0,0 +1,21 @@
+import { addPlugin, createResolver, defineNuxtModule, useNuxt } from '@nuxt/kit'
+
+export default defineNuxtModule({
+  meta: {
+    name: 'tauri',
+  },
+  setup() {
+    const nuxt = useNuxt()
+    const { resolve } = createResolver(import.meta.url)
+
+    if (!process.env.TAURI_PLATFORM)
+      return
+
+    nuxt.hook('vite:extend', ({ config }) => {
+      config.build!.target = ['es2021', 'chrome100', 'safari13']
+      config.envPrefix = [...config.envPrefix || [], 'VITE_', 'TAURI_']
+    })
+
+    addPlugin(resolve('./runtime/logging.client'))
+  },
+})
diff --git a/modules/tauri/runtime/logging.client.ts b/modules/tauri/runtime/logging.client.ts
new file mode 100644
index 00000000..a03bb399
--- /dev/null
+++ b/modules/tauri/runtime/logging.client.ts
@@ -0,0 +1,19 @@
+import * as log from 'tauri-plugin-log-api'
+
+// When running inside Tauri, catch all logs from 3rd party packages and direct them to the unified logging stream
+export default defineNuxtPlugin(() => {
+  // eslint-disable-next-line no-global-assign
+  console = {
+    ...console,
+    trace: log.trace,
+    debug: log.debug,
+    log: log.info,
+    warn: log.warn,
+    error: log.error,
+  }
+
+  window.addEventListener('unhandledrejection', err =>
+    log.error(err.reason),
+  )
+  window.addEventListener('error', err => log.error(err.error), true)
+})
diff --git a/nuxt.config.ts b/nuxt.config.ts
index d47589f8..4820e682 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -21,8 +21,10 @@ export default defineNuxtConfig({
     '~/modules/purge-comments',
     '~/modules/setup-components',
     '~/modules/pwa/index', // change to '@vite-pwa/nuxt' once released and remove pwa module
+    '~/modules/tauri/index',
   ],
   experimental: {
+    payloadExtraction: false,
     reactivityTransform: true,
     inlineSSRStyles: false,
   },
@@ -38,10 +40,6 @@ export default defineNuxtConfig({
     querystring: 'rollup-plugin-node-polyfills/polyfills/qs',
   },
   vite: {
-    // to make use of `TAURI_PLATFORM`, `TAURI_ARCH`, `TAURI_FAMILY`,
-    // `TAURI_PLATFORM_VERSION`, `TAURI_PLATFORM_TYPE` and `TAURI_DEBUG`
-    // env variables
-    envPrefix: ['VITE_', 'TAURI_'],
     define: {
       'import.meta.env.__BUILD_TIME__': JSON.stringify(new Date().toISOString()),
       'import.meta.env.__BUILD_COMMIT__': JSON.stringify(process.env.COMMIT_REF || ''),
@@ -49,7 +47,7 @@ export default defineNuxtConfig({
       'process.mock': ((!isCI || isPreview) && process.env.MOCK_USER) || 'false',
     },
     build: {
-      target: process.env.TAURI_PLATFORM ? ['es2021', 'chrome100', 'safari13'] : 'esnext',
+      target: 'esnext',
     },
     plugins: [
       Inspect(),