diff --git a/contracts/base/OwnerManager.sol b/contracts/base/OwnerManager.sol
index baf260ba9..b8657f404 100644
--- a/contracts/base/OwnerManager.sol
+++ b/contracts/base/OwnerManager.sol
@@ -38,8 +38,7 @@ abstract contract OwnerManager is SelfAuthorized, IOwnerManager {
         for (uint256 i = 0; i < _owners.length; i++) {
             // Owner address cannot be null.
             address owner = _owners[i];
-            if (owner == address(0) || owner == SENTINEL_OWNERS || owner == address(this) || currentOwner == owner)
-                revertWithError("GS203");
+            if (owner == address(0) || owner == SENTINEL_OWNERS || currentOwner == owner) revertWithError("GS203");
             // No duplicate owners allowed.
             if (owners[owner] != address(0)) revertWithError("GS204");
             owners[currentOwner] = owner;
diff --git a/test/core/Safe.Setup.spec.ts b/test/core/Safe.Setup.spec.ts
index 06c72df9d..21a0e6e6d 100644
--- a/test/core/Safe.Setup.spec.ts
+++ b/test/core/Safe.Setup.spec.ts
@@ -143,9 +143,7 @@ describe("Safe", () => {
                 signers: [, user2],
             } = await setupTests();
             const templateAddress = await template.getAddress();
-            await expect(
-                template.setup([user2.address, templateAddress], 2, AddressZero, "0x", AddressZero, AddressZero, 0, AddressZero),
-            ).to.be.revertedWith("GS203");
+            expect(await template.setup([user2.address, templateAddress], 2, AddressZero, "0x", AddressZero, AddressZero, 0, AddressZero));
         });
 
         it("should revert if sentinel is used as an owner", async () => {