diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java
index 3833376fc82fb34588edd7896fb245893544a80e..f0ae4deba9f754a290717d608921cc3acf353301 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java
@@ -1,5 +1,11 @@
 package de.ozgcloud.eingang.xta;
 
+import java.util.Objects;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.ws.client.WebServiceClientException;
@@ -12,10 +18,6 @@ import eu.osci.ws._2014._10.transport.OriginatorsType;
 import eu.osci.ws._2014._10.transport.PartyIdentifierType;
 import eu.osci.ws._2014._10.transport.PartyType;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-
 @Component
 class WsHeaderAddingInterceptor implements ClientInterceptor {
 
@@ -43,7 +45,10 @@ class WsHeaderAddingInterceptor implements ClientInterceptor {
 
 		PartyType partyType = new PartyType();
 		PartyIdentifierType identifier = new PartyIdentifierType();
-		identifier.setValue(xtaCurrentIdentifierService.getCurrentIdentifier());
+		identifier.setValue(Objects.requireNonNull(
+				xtaCurrentIdentifierService.getCurrentIdentifier(),
+				"Expect current identifier to be set!")
+		);
 		partyType.setIdentifier(identifier);
 
 		var origin = new OriginatorsType();
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java
index 0024ec287a64691c8ece083c10ee19ac262ac897..a4d501aad261068d52677f37b1e37bca858aeb84 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java
@@ -15,7 +15,7 @@ public class XtaCurrentIdentifierService {
 
 	@Setter
 	@Getter
-	private String currentIdentifier = "*";
+	private String currentIdentifier;
 
 	@Autowired
 	@Valid