diff --git a/packages/api/package.json b/packages/api/package.json
index 73ed7f7..c0b3c2e 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -50,9 +50,9 @@
     "@fastify/cors": "^9.0.1",
     "@fastify/middie": "8.3.1",
     "@fastify/static": "7.0.4",
-    "@modular-api/api": "^0.4.17",
+    "@modular-api/api": "^0.4.19",
     "@modular-api/fastify-cart": "^0.2.4",
-    "@modular-api/fastify-checkout": "^0.3.7",
+    "@modular-api/fastify-checkout": "^0.3.9",
     "@modular-api/fastify-oidc": "^0.5.4",
     "@mollie/api-client": "^3.7.0",
     "@slimfact/app": "^0.1.0",
diff --git a/packages/api/src/pgboss.ts b/packages/api/src/pgboss.ts
index 292783f..11791fe 100644
--- a/packages/api/src/pgboss.ts
+++ b/packages/api/src/pgboss.ts
@@ -2,6 +2,7 @@ import PgBoss, { Job } from 'pg-boss'
 import { db, postgresConnectionString } from '../src/kysely/index.js'
 import { InvoiceStatus, RawNewInvoice } from '@modular-api/fastify-checkout'
 import { FastifyInstance } from 'fastify'
+import { RefundStatus } from '@modular-api/fastify-checkout/types'
 
 let boss: PgBoss
 const createSubscriptionWorker = ({ fastify }: { fastify: FastifyInstance }) =>
@@ -16,6 +17,27 @@ const createSubscriptionWorker = ({ fastify }: { fastify: FastifyInstance }) =>
     return true
   }
 
+const createRefundWorker = ({ fastify }: { fastify: FastifyInstance }) =>
+  async function refundWorker() {
+    const refunds = await db
+      .selectFrom('checkout.refunds')
+      .where((web) =>
+        web.or([
+          web('status', '=', RefundStatus.PENDING),
+          web('status', '=', RefundStatus.PROCESSING),
+          web('status', '=', RefundStatus.QUEUED)
+        ])
+      )
+      .select('id')
+      .execute()
+
+    for (const refund of refunds) {
+      await fastify.checkout?.paymentHandlers?.mollie?.getRefund({
+        id: refund.id
+      })
+    }
+  }
+
 export const initialize = async ({ fastify }: { fastify: FastifyInstance }) => {
   boss = new PgBoss(postgresConnectionString)
 
@@ -34,6 +56,21 @@ export const initialize = async ({ fastify }: { fastify: FastifyInstance }) => {
         subscriptionWorker
       )
     })
+
+  const refundWorker = createRefundWorker({ fastify })
+  await boss.work(
+    'checkRefunds',
+    { batchSize: 1, includeMetadata: true },
+    refundWorker
+  )
+  if (!schedules.some((schedule) => schedule.name === 'checkRefunds')) {
+    const queueName = `checkRefunds`
+
+    if (!(await boss.getQueue(queueName))) {
+      await boss.createQueue(queueName)
+    }
+    await boss.schedule(queueName, '0 0 * * *', {}, {})
+  }
   // await boss.work(
   //   'subscription:*',
   //   { batchSize: 1, includeMetadata: true },
diff --git a/packages/app/package.json b/packages/app/package.json
index 8cc2241..6c5111a 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@modular-api/fastify-cart": "^0.2.4",
     "@modular-api/fastify-checkout": "^0.3.3",
-    "@modular-api/quasar-components": "^0.2.10",
+    "@modular-api/quasar-components": "^0.2.11",
     "@quasar/extras": "1.16.11",
     "@quasar/quasar-ui-qcalendar": "4.0.0-beta.16",
     "@simsustech/quasar-components": "^0.10.3",
diff --git a/packages/app/src/components/invoice/InvoiceExpansionItem.vue b/packages/app/src/components/invoice/InvoiceExpansionItem.vue
index a063435..1ede869 100644
--- a/packages/app/src/components/invoice/InvoiceExpansionItem.vue
+++ b/packages/app/src/components/invoice/InvoiceExpansionItem.vue
@@ -344,6 +344,11 @@
         name="payments"
         :label="lang.payment.payments"
       />
+      <q-tab
+        v-if="modelValue.refunds?.length"
+        name="refunds"
+        :label="lang.refund.refunds"
+      />
     </q-tabs>
 
     <q-separator />
@@ -396,6 +401,15 @@
           />
         </q-list>
       </q-tab-panel>
+      <q-tab-panel v-if="modelValue.refunds?.length" name="refunds">
+        <q-list>
+          <refund-item
+            v-for="refund in modelValue.refunds"
+            :key="refund.id"
+            :model-value="refund"
+          />
+        </q-list>
+      </q-tab-panel>
     </q-tab-panels>
 
     <!-- <q-scroll-area :style="scrollAreaSize">
@@ -417,7 +431,8 @@ import Price from '../Price.vue'
 import {
   InvoiceLineRow,
   InvoiceDiscountSurchargeRow,
-  PaymentItem
+  PaymentItem,
+  RefundItem
 } from '@modular-api/quasar-components/checkout'
 import { computed, ref, toRefs } from 'vue'
 import { useQuasar } from 'quasar'
diff --git a/packages/app/src/lang/en-US.ts b/packages/app/src/lang/en-US.ts
index c9fe140..0680256 100644
--- a/packages/app/src/lang/en-US.ts
+++ b/packages/app/src/lang/en-US.ts
@@ -217,7 +217,12 @@ const lang: Language = {
     }
   },
   refund: {
-    refund: 'Refund'
+    refund: 'Refund',
+    refunds: 'Refunds',
+    messages: {
+      confirmRefund: (amount) =>
+        `Are you sure you want to refund the amount of ${amount}?`
+    }
   }
 }
 
diff --git a/packages/app/src/lang/index.ts b/packages/app/src/lang/index.ts
index 5e6cd38..ed36081 100644
--- a/packages/app/src/lang/index.ts
+++ b/packages/app/src/lang/index.ts
@@ -241,6 +241,10 @@ export interface Language {
   }
   refund: {
     refund: string
+    refunds: string
+    messages: {
+      confirmRefund: (amount: number | string) => string
+    }
   }
 }
 
diff --git a/packages/app/src/lang/nl.ts b/packages/app/src/lang/nl.ts
index 5f70bae..348d64f 100644
--- a/packages/app/src/lang/nl.ts
+++ b/packages/app/src/lang/nl.ts
@@ -219,7 +219,12 @@ const lang: Language = {
     }
   },
   refund: {
-    refund: 'Terugbetaling'
+    refund: 'Terugbetaling',
+    refunds: 'Terugbetalingen',
+    messages: {
+      confirmRefund: (amount) =>
+        `Weet u zeker dat u een terugbetaling t.w.v. ${amount} wil doen?`
+    }
   }
 }
 
diff --git a/packages/app/src/pages/InvoicePage.vue b/packages/app/src/pages/InvoicePage.vue
index beb11ed..8fb1cc5 100644
--- a/packages/app/src/pages/InvoicePage.vue
+++ b/packages/app/src/pages/InvoicePage.vue
@@ -295,15 +295,24 @@ const payWithSmartpin = async () => {
 }
 
 const refund = async () => {
-  if (invoice.value) {
-    const result = useMutation('admin.refundInvoice', {
-      args: {
-        id: invoice.value.id
-      },
-      immediate: true
+  if (invoice.value?.amountDue && invoice.value.amountDue < 0) {
+    $q.dialog({
+      message: lang.value.refund.messages.confirmRefund(
+        format(-invoice.value.amountDue)
+      ),
+      cancel: true
+    }).onOk(async () => {
+      if (invoice.value?.id) {
+        const result = useMutation('admin.refundInvoice', {
+          args: {
+            id: invoice.value.id
+          },
+          immediate: true
+        })
+
+        await result.immediatePromise
+      }
     })
-
-    await result.immediatePromise
   }
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 871c302..0c19c0e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,14 +49,14 @@ importers:
         specifier: 7.0.4
         version: 7.0.4
       '@modular-api/api':
-        specifier: ^0.4.17
-        version: 0.4.17(bcrypt@5.1.1)(fastify@4.27.0)(handlebars@4.7.8)(kysely@0.27.4)(openid-client@5.6.5)(otplib@12.0.1)(typescript@5.4.5)(vue@3.4.27)
+        specifier: ^0.4.19
+        version: 0.4.19(bcrypt@5.1.1)(fastify@4.27.0)(handlebars@4.7.8)(kysely@0.27.4)(openid-client@5.6.5)(otplib@12.0.1)(typescript@5.4.5)(vue@3.4.27)
       '@modular-api/fastify-cart':
         specifier: ^0.2.4
         version: 0.2.4(kysely@0.27.4)
       '@modular-api/fastify-checkout':
-        specifier: ^0.3.7
-        version: 0.3.7(kysely@0.27.4)
+        specifier: ^0.3.9
+        version: 0.3.9(kysely@0.27.4)
       '@modular-api/fastify-oidc':
         specifier: ^0.5.4
         version: 0.5.4(@fastify/static@7.0.4)(bcrypt@5.1.1)(fastify@4.27.0)(handlebars@4.7.8)(kysely@0.27.4)(otplib@12.0.1)(typescript@5.4.5)
@@ -204,8 +204,8 @@ importers:
         specifier: ^0.3.3
         version: 0.3.6(kysely@0.27.4)
       '@modular-api/quasar-components':
-        specifier: ^0.2.10
-        version: 0.2.10(quasar@2.16.4)
+        specifier: ^0.2.11
+        version: 0.2.11(quasar@2.16.4)
       '@quasar/extras':
         specifier: 1.16.11
         version: 1.16.11
@@ -2917,8 +2917,8 @@ packages:
       - supports-color
     dev: false
 
-  /@modular-api/api@0.4.17(bcrypt@5.1.1)(fastify@4.27.0)(handlebars@4.7.8)(kysely@0.27.4)(openid-client@5.6.5)(otplib@12.0.1)(typescript@5.4.5)(vue@3.4.27):
-    resolution: {integrity: sha512-xSFuw4JO2y9sbRK4WMAuPLmWDVi62R+TOBjUo7ANRNr58xU6XTelGMRhdVdMJp/5SEmDxnGqSUHEE6NFdji5KA==}
+  /@modular-api/api@0.4.19(bcrypt@5.1.1)(fastify@4.27.0)(handlebars@4.7.8)(kysely@0.27.4)(openid-client@5.6.5)(otplib@12.0.1)(typescript@5.4.5)(vue@3.4.27):
+    resolution: {integrity: sha512-wL/NYRmMfLTgjukIncLyZZ3xUFg1UBw/DEeDVZ5i0pxSHdY8Ny6LrhXyDu+lSpe3j99u/x/m0lvbCEE8WSnceQ==}
     peerDependencies:
       kysely: ^0.27.4
       openid-client: ^5.6.5
@@ -2929,7 +2929,7 @@ packages:
       '@fastify/middie': 8.3.1
       '@fastify/static': 7.0.4
       '@modular-api/fastify-cart': 0.2.4(kysely@0.27.4)
-      '@modular-api/fastify-checkout': 0.3.7(kysely@0.27.4)
+      '@modular-api/fastify-checkout': 0.3.9(kysely@0.27.4)
       '@modular-api/fastify-oidc': 0.5.4(@fastify/static@7.0.4)(bcrypt@5.1.1)(fastify@4.27.0)(handlebars@4.7.8)(kysely@0.27.4)(otplib@12.0.1)(typescript@5.4.5)
       '@trpc/server': 10.45.2
       '@types/compression': 1.7.5
@@ -2987,8 +2987,8 @@ packages:
       - debug
     dev: true
 
-  /@modular-api/fastify-checkout@0.3.7(kysely@0.27.4):
-    resolution: {integrity: sha512-JaOaPWUeoClSuEL70ZD3+sjBhLoqrWS9BdByXQD2BN/tHkCEUr2ClcFQlpZseBx+6Q8s+VegxsGz5OJYQ/Svcg==}
+  /@modular-api/fastify-checkout@0.3.9(kysely@0.27.4):
+    resolution: {integrity: sha512-0mj+jlXN4OAGbY3n2BW8eAMNxoQ8BB/vLlzjFjPJClQo8aT3IOfm8ppjE938MIbglc3cuSmryOh1t7EbI+ad6Q==}
     peerDependencies:
       kysely: ^0.27.4
     dependencies:
@@ -3039,8 +3039,8 @@ packages:
       fastify: 4.27.0
     dev: false
 
-  /@modular-api/quasar-components@0.2.10(quasar@2.16.4):
-    resolution: {integrity: sha512-HzaL4TwPvocIrLAKRQ9vujEAOk4g1pXydFOynSM+3nEgae1m6zqO6wJe1LiZGQzVN0botKy6tin6oQEMhnDJIg==}
+  /@modular-api/quasar-components@0.2.11(quasar@2.16.4):
+    resolution: {integrity: sha512-36+4iQQlbn9R2dP+K7KRlge8KhfBbCGdg7Wu3AwHTTklKoMjsqYI1Z/MKVxY10j+qeMufCp7Mza21h2T/6xWig==}
     peerDependencies:
       quasar: ^2.15.2
     dependencies: