diff --git a/knoe-db/schema/ekosystem.sql b/knoe-db/schema/ekosystem.sql
index 7665f0c..cccf634 100644
--- a/knoe-db/schema/ekosystem.sql
+++ b/knoe-db/schema/ekosystem.sql
@@ -179,11 +179,10 @@ BEGIN
 
     v_uuid := knoe.ekosystem_id(0, 0);  -- root authority mints the UUID
 
-    INSERT INTO knoe.tenants (tenant_id, uuid, name)
-    VALUES (v_tenant_id, v_uuid, p_name)
-    RETURNING tenants.tenant_id, tenants.uuid, tenants.name;
-
-    RETURN NEXT;
+    RETURN QUERY
+        INSERT INTO knoe.tenants (tenant_id, uuid, name)
+        VALUES (v_tenant_id::smallint, v_uuid, p_name)
+        RETURNING tenants.tenant_id::integer, tenants.uuid, tenants.name;
 END;
 $$;