diff --git a/contracts/token/ERC20/StandaloneERC20.sol b/contracts/token/ERC20/StandaloneERC20.sol
index 9d5e6cedc..35f5f8f76 100644
--- a/contracts/token/ERC20/StandaloneERC20.sol
+++ b/contracts/token/ERC20/StandaloneERC20.sol
@@ -13,7 +13,7 @@ import "./ERC20Pausable.sol";
 contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable {
     function initialize(
         string memory name, string memory symbol, uint8 decimals, uint256 initialSupply, address initialHolder,
-        address[] memory minters, address[] memory pausers, address sender
+        address[] memory minters, address[] memory pausers
     ) public initializer {
         ERC20Detailed.initialize(name, symbol, decimals);
 
@@ -21,11 +21,11 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
         _mint(initialHolder, initialSupply);
 
         // Initialize the minter and pauser roles, and renounce them
-        ERC20Mintable.initialize(sender);
-        _removeMinter(sender);
+        ERC20Mintable.initialize(address(this));
+        _removeMinter(address(this));
 
-        ERC20Pausable.initialize(sender);
-        _removePauser(sender);
+        ERC20Pausable.initialize(address(this));
+        _removePauser(address(this));
 
         // Add the requested minters and pausers (this can be done after renouncing since
         // these are the internal calls)
@@ -39,16 +39,16 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
     }
 
     function initialize(
-        string memory name, string memory symbol, uint8 decimals, address[] memory minters, address[] memory pausers, address sender
+        string memory name, string memory symbol, uint8 decimals, address[] memory minters, address[] memory pausers
     ) public initializer {
         ERC20Detailed.initialize(name, symbol, decimals);
 
         // Initialize the minter and pauser roles, and renounce them
-        ERC20Mintable.initialize(sender);
-        _removeMinter(sender);
+        ERC20Mintable.initialize(address(this));
+        _removeMinter(address(this));
 
-        ERC20Pausable.initialize(sender);
-        _removePauser(sender);
+        ERC20Pausable.initialize(address(this));
+        _removePauser(address(this));
 
         // Add the requested minters and pausers (this can be done after renouncing since
         // these are the internal calls)
diff --git a/contracts/token/ERC721/StandaloneERC721.sol b/contracts/token/ERC721/StandaloneERC721.sol
index 52c32276e..6dfb7ecf7 100644
--- a/contracts/token/ERC721/StandaloneERC721.sol
+++ b/contracts/token/ERC721/StandaloneERC721.sol
@@ -15,17 +15,17 @@ import "./ERC721Pausable.sol";
 contract StandaloneERC721
     is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable
 {
-    function initialize(string memory name, string memory symbol, address[] memory minters, address[] memory pausers, address sender) public initializer {
+    function initialize(string memory name, string memory symbol, address[] memory minters, address[] memory pausers) public initializer {
         ERC721.initialize();
         ERC721Enumerable.initialize();
         ERC721Metadata.initialize(name, symbol);
 
         // Initialize the minter and pauser roles, and renounce them
-        ERC721MetadataMintable.initialize(sender);
-        _removeMinter(sender);
+        ERC721MetadataMintable.initialize(address(this));
+        _removeMinter(address(this));
 
-        ERC721Pausable.initialize(sender);
-        _removePauser(sender);
+        ERC721Pausable.initialize(address(this));
+        _removePauser(address(this));
 
         // Add the requested minters and pausers (this can be done after renouncing since
         // these are the internal calls)
diff --git a/test/token/ERC20/StandaloneERC20.test.js b/test/token/ERC20/StandaloneERC20.test.js
index 506073ffe..4b568c9a8 100644
--- a/test/token/ERC20/StandaloneERC20.test.js
+++ b/test/token/ERC20/StandaloneERC20.test.js
@@ -23,14 +23,14 @@ contract('StandaloneERC20', function ([
   });
 
   async function initializeFull (token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) {
-    const signature = 'initialize(string,string,uint8,uint256,address,address[],address[],address)';
-    const args = [name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from];
+    const signature = 'initialize(string,string,uint8,uint256,address,address[],address[])';
+    const args = [name, symbol, decimals, initialSupply, initialHolder, minters, pausers];
     await token.methods[signature](...args, { from });
   }
 
   async function initializePartial (token, name, symbol, decimals, minters, pausers, from) {
-    const signature = 'initialize(string,string,uint8,address[],address[],address)';
-    const args = [name, symbol, decimals, minters, pausers, from];
+    const signature = 'initialize(string,string,uint8,address[],address[])';
+    const args = [name, symbol, decimals, minters, pausers];
     await token.methods[signature](...args, { from });
   }
 
diff --git a/test/token/ERC721/StandaloneERC721.test.js b/test/token/ERC721/StandaloneERC721.test.js
index 8e6b2ebc3..175534208 100644
--- a/test/token/ERC721/StandaloneERC721.test.js
+++ b/test/token/ERC721/StandaloneERC721.test.js
@@ -14,8 +14,8 @@ contract('StandaloneERC721', function ([_, deployer, minterA, minterB, pauserA,
   });
 
   async function initialize (token, name, symbol, minters, pausers, from) {
-    const signature = 'initialize(string,string,address[],address[],address)';
-    const args = [name, symbol, minters, pausers, from];
+    const signature = 'initialize(string,string,address[],address[])';
+    const args = [name, symbol, minters, pausers];
     await token.methods[signature](...args, { from });
   }