diff --git a/README.md b/README.md
index 2952892..a6a1c05 100644
--- a/README.md
+++ b/README.md
@@ -60,10 +60,10 @@ MODE_PS="1"
 ```json
 {
   "action": "initiate",
-  "sessionId": "",
   "serviceId": "ff294c2e2c7d01bd5f9701abc117737917bb1f91044ba6b2d0903fc806db0d65",
   "consumerAddress": "0xd727fb9be39fa019d7c02fea19e54d688da3a662",
   "policyServer": {
+    "sessionId": "",
     "successRedirectUri": "",
     "errorRedirectUri": "",
     "responseRedirectUri": "",
diff --git a/src/handlers/waltIdPolicyHandler.ts b/src/handlers/waltIdPolicyHandler.ts
index 957a652..77fbc7e 100644
--- a/src/handlers/waltIdPolicyHandler.ts
+++ b/src/handlers/waltIdPolicyHandler.ts
@@ -15,8 +15,9 @@ export class WaltIdPolicyHandler extends PolicyHandler {
     requestPayload: PolicyRequestPayload
   ): Promise<PolicyRequestResponse> {
     const uuid =
-      requestPayload.sessionId && requestPayload.sessionId !== ''
-        ? requestPayload.sessionId
+      requestPayload.policyServer?.sessionId &&
+      requestPayload.policyServer?.sessionId !== ''
+        ? requestPayload.policyServer?.sessionId
         : randomUUID()
 
     const successRedirectUri = requestPayload.policyServer?.successRedirectUri
diff --git a/swagger.json b/swagger.json
index 103cc3e..8edceff 100644
--- a/swagger.json
+++ b/swagger.json
@@ -38,10 +38,10 @@
                   "summary": "Initiate action, returns presentation_uri including session_id",
                   "value": {
                     "action": "initiate",
-                    "sessionId": "",
                     "serviceId": "ff294c2e2c7d01bd5f9701abc117737917bb1f91044ba6b2d0903fc806db0d65",
                     "consumerAddress": "0xd727fb9be39fa019d7c02fea19e54d688da3a662",
                     "policyServer": {
+                      "sessionId": "",
                       "successRedirectUri": "",
                       "errorRedirectUri": "",
                       "responseRedirectUri": "",