diff --git a/src/main/java/messagerosa/core/model/XMessage.java b/src/main/java/messagerosa/core/model/XMessage.java
index 68d7e7a..3f36388 100644
--- a/src/main/java/messagerosa/core/model/XMessage.java
+++ b/src/main/java/messagerosa/core/model/XMessage.java
@@ -50,7 +50,7 @@ public enum MessageType {
 
 	private String ownerOrgId;
 
-	private UUID ownerId;
+	private String ownerId;
 
 	//Persist
 	private String app;