diff --git a/trustgraph-flow/trustgraph/iam/service/iam.py b/trustgraph-flow/trustgraph/iam/service/iam.py
index 3f9bc5b9..b9febb0f 100644
--- a/trustgraph-flow/trustgraph/iam/service/iam.py
+++ b/trustgraph-flow/trustgraph/iam/service/iam.py
@@ -901,22 +901,20 @@ class IamService:
                 "workspace ids beginning with '_' are reserved",
             )
 
+        if self._on_workspace_created:
+            await self._on_workspace_created(v.workspace_record.id)
+
         existing = await self.table_store.get_workspace(
             v.workspace_record.id,
         )
-        if existing is not None:
-            return _err("duplicate", "workspace already exists")
-
-        now = _now_dt()
-        await self.table_store.put_workspace(
-            id=v.workspace_record.id,
-            name=v.workspace_record.name or v.workspace_record.id,
-            enabled=v.workspace_record.enabled,
-            created=now,
-        )
-
-        if self._on_workspace_created:
-            await self._on_workspace_created(v.workspace_record.id)
+        if existing is None:
+            now = _now_dt()
+            await self.table_store.put_workspace(
+                id=v.workspace_record.id,
+                name=v.workspace_record.name or v.workspace_record.id,
+                enabled=v.workspace_record.enabled,
+                created=now,
+            )
 
         row = await self.table_store.get_workspace(v.workspace_record.id)
         return IamResponse(workspace=self._row_to_workspace_record(row))
diff --git a/trustgraph-flow/trustgraph/iam/service/service.py b/trustgraph-flow/trustgraph/iam/service/service.py
index b6945e87..9e1fe707 100644
--- a/trustgraph-flow/trustgraph/iam/service/service.py
+++ b/trustgraph-flow/trustgraph/iam/service/service.py
@@ -151,7 +151,7 @@ class Processor(AsyncProcessor):
             keyspace=keyspace,
             bootstrap_mode=self.bootstrap_mode,
             bootstrap_token=self.bootstrap_token,
-            on_workspace_created=self._announce_workspace_created,
+            on_workspace_created=self._ensure_workspace_registered,
             on_workspace_deleted=self._announce_workspace_deleted,
         )
 
@@ -218,20 +218,14 @@ class Processor(AsyncProcessor):
         finally:
             await client.stop()
 
-    async def _announce_workspace_created(self, workspace_id):
-        try:
-            await self._config_put(
-                "__workspaces__", "workspace", workspace_id,
-                '{"enabled": true}',
-            )
-            logger.info(
-                f"Announced workspace creation: {workspace_id}"
-            )
-        except Exception as e:
-            logger.error(
-                f"Failed to announce workspace creation "
-                f"{workspace_id}: {e}", exc_info=True,
-            )
+    async def _ensure_workspace_registered(self, workspace_id):
+        await self._config_put(
+            "__workspaces__", "workspace", workspace_id,
+            '{"enabled": true}',
+        )
+        logger.info(
+            f"Registered workspace in config: {workspace_id}"
+        )
 
     async def _announce_workspace_deleted(self, workspace_id):
         try: