diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ff8aed7..9649041 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,7 +2,7 @@ name: Publish
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   run-checks:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d82a70..7c62bae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: Test
 on:
   pull_request:
   push:
-    branches: [master]
+    branches: [main]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
diff --git a/package-lock.json b/package-lock.json
index 1ee8355..5a5af5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@nmshd/typescript-rest",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@nmshd/typescript-rest",
-      "version": "3.1.1",
+      "version": "3.1.2",
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "1.19.5",
diff --git a/package.json b/package.json
index d12e374..86d9521 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nmshd/typescript-rest",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "A Library to create RESTFul APIs with Typescript",
   "keywords": [
     "API",
diff --git a/src/server/service-invoker.ts b/src/server/service-invoker.ts
index 53388f7..335a119 100644
--- a/src/server/service-invoker.ts
+++ b/src/server/service-invoker.ts
@@ -75,7 +75,11 @@ export class ServiceInvoker {
         if (this.postProcessors.length) {
             await this.runPostProcessors(context);
         }
-        this.processResponseHeaders(context);
+
+        if (!context.response.headersSent) {
+            this.processResponseHeaders(context);
+        }
+
         await this.sendValue(result, context);
     }