diff --git a/src/ERC173/ERC173.sol b/src/ERC173/ERC173.sol
index 12f7c9b3..7a998401 100644
--- a/src/ERC173/ERC173.sol
+++ b/src/ERC173/ERC173.sol
@@ -38,7 +38,9 @@ contract ERC173Facet {
     function transferOwnership(address _newOwner) external {
         ERC173Storage storage s = getStorage();
         if (msg.sender != s.owner) revert OwnableUnauthorizedAccount();
-        emit OwnershipTransferred(s.owner, _newOwner);
+        address previousOwner = s.owner;
         s.owner = _newOwner;
+
+        emit OwnershipTransferred(previousOwner, _newOwner);
     }
 }
diff --git a/src/ERC173/libraries/LibERC173.sol b/src/ERC173/libraries/LibERC173.sol
index cc980e90..1587a51b 100644
--- a/src/ERC173/libraries/LibERC173.sol
+++ b/src/ERC173/libraries/LibERC173.sol
@@ -38,7 +38,9 @@ library LibERC173 {
     function transferOwnership(address _newOwner) internal {
         ERC173Storage storage s = getStorage();
         if (s.owner == address(0)) revert OwnableAlreadyRenounced();
-        emit OwnershipTransferred(s.owner, _newOwner);
+        address previousOwner = s.owner;
         s.owner = _newOwner;
+
+        emit OwnershipTransferred(previousOwner, _newOwner);
     }
 }