diff --git a/app/pages/hunt/[huntSlug]/[questSlug]/index.vue b/app/pages/hunt/[huntSlug]/[questSlug]/index.vue
index 162bf3c..30b700d 100644
--- a/app/pages/hunt/[huntSlug]/[questSlug]/index.vue
+++ b/app/pages/hunt/[huntSlug]/[questSlug]/index.vue
@@ -268,6 +268,16 @@ async function submit() {
               <p v-if="hasKey(data, 'question')">
                 🖋: {{ t(`enums.text_type.${data.textType}`) }}
               </p>
+              <VaButton
+                v-if="data.locationLink"
+                icon="open_in_new"
+                target="_blank"
+                :href="data.locationLink"
+                >{{ data.location ?? 'Location' }}</VaButton
+              >
+              <VaAlert v-else-if="data.location" class="w-full">{{
+                data.location
+              }}</VaAlert>
               <VaDivider v-if="hasKey(data, 'extraText')" />
               <p v-if="hasKey(data, 'extraText')">
                 <span class="uppercase">{{
diff --git a/server/api/quest/[questId]/index.get.ts b/server/api/quest/[questId]/index.get.ts
index 640bd84..7094bc0 100644
--- a/server/api/quest/[questId]/index.get.ts
+++ b/server/api/quest/[questId]/index.get.ts
@@ -22,6 +22,8 @@ export default defineEventHandler(async (event) => {
       title_en: true,
       description_de: true,
       description_en: true,
+      location: true,
+      locationLink: true,
       isBingo: true,
       picture: {
         select: {