diff --git a/contracts/utils/contracts/src/Refundable.sol b/contracts/utils/contracts/src/Refundable.sol
index 175773aee1..42293d9bac 100644
--- a/contracts/utils/contracts/src/Refundable.sol
+++ b/contracts/utils/contracts/src/Refundable.sol
@@ -35,8 +35,7 @@ contract Refundable {
         } else {
             _disableRefund();
             _;
-            _enableRefund();
-            _refundNonZeroBalance();
+            _enableAndRefundNonZeroBalance();
         }
     }
 
@@ -63,10 +62,11 @@ contract Refundable {
         _shouldNotRefund = true;
     }
 
-    function _enableRefund()
+    function _enableAndRefundNonZeroBalance()
         internal
     {
         _shouldNotRefund = false;
+        _refundNonZeroBalance();
     }
 
     function _areRefundsDisabled()