diff --git a/ts/manager.domain/classes.domain.ts b/ts/manager.domain/classes.domain.ts
index c25a7a2..7588ada 100644
--- a/ts/manager.domain/classes.domain.ts
+++ b/ts/manager.domain/classes.domain.ts
@@ -56,10 +56,13 @@ export class Domain extends plugins.smartdata.SmartDataDbDoc<
     if (!domain) {
       throw new Error(`Domain with id ${domainIdArg} not found`);
     }
-    Object.assign(domain.data, domainDataArg, {
-      updatedAt: Date.now(),
-      activationState: domain.data.activationState || 'available',
-    });
+    // Merge updates and respect incoming activationState when provided
+    Object.assign(domain.data, domainDataArg);
+    domain.data.updatedAt = Date.now();
+    // Ensure activationState has a sensible default if still missing
+    if (!domain.data.activationState) {
+      (domain.data as any).activationState = 'available';
+    }
     await domain.save();
     return domain;
   }
@@ -91,7 +94,7 @@ export class Domain extends plugins.smartdata.SmartDataDbDoc<
   }
 
   // INSTANCE
-  @plugins.smartdata.svDb()
+  @plugins.smartdata.unI()
   public id: string;
 
   @plugins.smartdata.svDb()