diff --git a/.env.example b/.env.example
index b60c276900..a21e7f83c6 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
 NUXT_PUBLIC_TRANSLATE_API=
+NUXT_PUBLIC_DEFAULT_SERVER=
 
 # Production only
 NUXT_CLOUDFLARE_ACCOUNT_ID=
diff --git a/components/user/UserSignIn.vue b/components/user/UserSignIn.vue
index b9ae358953..0c9af5d431 100644
--- a/components/user/UserSignIn.vue
+++ b/components/user/UserSignIn.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import Fuse from 'fuse.js'
 import { $fetch } from 'ofetch'
-import { DEFAULT_SERVER } from '~/constants'
 
 const input = $ref<HTMLInputElement>()
 let server = $ref<string>('')
@@ -26,7 +25,7 @@ async function oauth() {
     server = server.split('/')[0]
 
   try {
-    location.href = await $fetch<string>(`/api/${server || DEFAULT_SERVER}/login`, {
+    location.href = await $fetch<string>(`/api/${server || publicServer.value}/login`, {
       method: 'POST',
       body: {
         origin: location.origin,
diff --git a/composables/users.ts b/composables/users.ts
index 0cdf110ae2..190b87c3f8 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -5,7 +5,6 @@ import type { RemovableRef } from '@vueuse/core'
 import type { ElkMasto, UserLogin } from '~/types'
 import {
   DEFAULT_POST_CHARS_LIMIT,
-  DEFAULT_SERVER,
   STORAGE_KEY_CURRENT_USER,
   STORAGE_KEY_NOTIFICATION,
   STORAGE_KEY_NOTIFICATION_POLICY,
@@ -57,7 +56,7 @@ export const currentUser = computed<UserLogin | undefined>(() => {
 const publicInstance = ref<Instance | null>(null)
 export const currentInstance = computed<null | Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
 
-export const publicServer = ref(DEFAULT_SERVER)
+export const publicServer = ref('')
 export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
 
 // when multiple tabs: we need to reload window when sign in, switch account or sign out
diff --git a/constants/index.ts b/constants/index.ts
index 7770ca1de6..2c33a9cacf 100644
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -1,7 +1,6 @@
 export const APP_NAME = 'Elk'
 
 export const DEFAULT_POST_CHARS_LIMIT = 500
-export const DEFAULT_SERVER = 'mas.to'
 export const DEFAULT_FONT_SIZE = 'md'
 
 export const STORAGE_KEY_DRAFTS = 'elk-drafts'
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6d4e10b844..c158dfae43 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -95,6 +95,7 @@ export default defineNuxtConfig({
       env: '', // set in build-info module
       pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
       translateApi: '',
+      defaultServer: 'mas.to',
     },
     storage: {
       driver: isCI ? 'cloudflare' : 'fs',
diff --git a/plugins/masto.ts b/plugins/masto.ts
index 1fd0ac5b6f..d4918ee16c 100644
--- a/plugins/masto.ts
+++ b/plugins/masto.ts
@@ -1,5 +1,6 @@
 export default defineNuxtPlugin(async (nuxtApp) => {
   const masto = createMasto()
+  publicServer.value = publicServer.value || useRuntimeConfig().public.defaultServer
 
   if (process.client) {
     const { query } = useRoute()