diff --git a/smart-contracts/osmosis/contracts/cl-vault/src/helpers/getters.rs b/smart-contracts/osmosis/contracts/cl-vault/src/helpers/getters.rs
index 3e7f32a89..8f5a530a3 100644
--- a/smart-contracts/osmosis/contracts/cl-vault/src/helpers/getters.rs
+++ b/smart-contracts/osmosis/contracts/cl-vault/src/helpers/getters.rs
@@ -202,20 +202,30 @@ pub fn get_single_sided_deposit_1_to_0_swap_amount(
     Ok(swap_amount)
 }
 
-pub fn get_unused_balances(querier: &QuerierWrapper, env: &Env) -> Result<CoinList, ContractError> {
+pub fn get_unused_balances(
+    querier: &QuerierWrapper,
+    addr: &Addr,
+) -> Result<CoinList, ContractError> {
     Ok(CoinList::from_coins(
-        querier.query_all_balances(env.contract.address.to_string())?,
+        querier.query_all_balances(addr.to_string())?,
     ))
 }
 
+pub fn get_unused_pair(
+    deps: &Deps,
+    addr: &Addr,
+    pool_config: &PoolConfig,
+) -> Result<PoolPair<Coin, Coin>, ContractError> {
+    let unused_balances = get_unused_balances(&deps.querier, addr)?;
+    Ok(get_vault_funds_or_zero(&unused_balances, pool_config))
+}
+
 pub fn get_unused_pair_balances(
-    deps: &DepsMut,
+    deps: &Deps,
     env: &Env,
     pool_config: &PoolConfig,
 ) -> Result<Vec<Coin>, ContractError> {
-    let unused_balances = get_unused_balances(&deps.querier, env)?;
-    let vault_funds = get_vault_funds_or_zero(&unused_balances, pool_config);
-
+    let vault_funds = get_unused_pair(deps, &env.contract.address, pool_config)?;
     Ok(vec![vault_funds.base, vault_funds.quote])
 }
 
diff --git a/smart-contracts/osmosis/contracts/cl-vault/src/instantiate.rs b/smart-contracts/osmosis/contracts/cl-vault/src/instantiate.rs
index 8da71b281..023ebe70f 100644
--- a/smart-contracts/osmosis/contracts/cl-vault/src/instantiate.rs
+++ b/smart-contracts/osmosis/contracts/cl-vault/src/instantiate.rs
@@ -77,7 +77,7 @@ pub fn handle_instantiate(
     }
     .into();
 
-    let vault_funds = get_unused_pair_balances(&deps, &env, &pool_config)?;
+    let vault_funds = get_unused_pair_balances(&deps.as_ref(), &env, &pool_config)?;
 
     let create_position_msg = create_position(
         deps,
diff --git a/smart-contracts/osmosis/contracts/cl-vault/src/query.rs b/smart-contracts/osmosis/contracts/cl-vault/src/query.rs
index 9da35e720..c0f17a5b3 100644
--- a/smart-contracts/osmosis/contracts/cl-vault/src/query.rs
+++ b/smart-contracts/osmosis/contracts/cl-vault/src/query.rs
@@ -177,7 +177,7 @@ pub fn query_user_balance(
 pub fn query_total_assets(deps: Deps, env: Env) -> Result<TotalAssetsResponse, ContractError> {
     let position = get_position(deps.storage, &deps.querier)?;
     let pool = POOL_CONFIG.load(deps.storage)?;
-    let unused_balance = get_unused_balances(&deps.querier, &env)?;
+    let unused_balance = get_unused_balances(&deps.querier, &env.contract.address)?;
 
     // add token0 unused balance to what's in the position
     let mut token0 = position
diff --git a/smart-contracts/osmosis/contracts/cl-vault/src/vault/autocompound.rs b/smart-contracts/osmosis/contracts/cl-vault/src/vault/autocompound.rs
index 56764670a..d587fb6ea 100644
--- a/smart-contracts/osmosis/contracts/cl-vault/src/vault/autocompound.rs
+++ b/smart-contracts/osmosis/contracts/cl-vault/src/vault/autocompound.rs
@@ -33,7 +33,7 @@ pub fn execute_autocompound(
         .ok_or(ContractError::PositionNotFound)?;
 
     let pool = POOL_CONFIG.load(deps.storage)?;
-    let balance = get_unused_pair_balances(&deps, env, &pool)?;
+    let balance = get_unused_pair_balances(&deps.as_ref(), env, &pool)?;
 
     let token0 = balance[0].clone();
     let token1 = balance[1].clone();
diff --git a/smart-contracts/osmosis/contracts/cl-vault/src/vault/range.rs b/smart-contracts/osmosis/contracts/cl-vault/src/vault/range.rs
index 891e872cd..a1742694e 100644
--- a/smart-contracts/osmosis/contracts/cl-vault/src/vault/range.rs
+++ b/smart-contracts/osmosis/contracts/cl-vault/src/vault/range.rs
@@ -116,7 +116,7 @@ pub fn handle_withdraw_position_reply(deps: DepsMut, env: Env) -> Result<Respons
     let pool_config = POOL_CONFIG.load(deps.storage)?;
     let pool_details = get_cl_pool_info(&deps.querier, pool_config.pool_id)?;
 
-    let unused_pair_balances = get_unused_pair_balances(&deps, &env, &pool_config)?;
+    let unused_pair_balances = get_unused_pair_balances(&deps.as_ref(), &env, &pool_config)?;
 
     let sqrt_pu = tick_to_price(modify_range_state.upper_tick)?.sqrt();
     let sqrt_pl = tick_to_price(modify_range_state.lower_tick)?.sqrt();
@@ -251,7 +251,7 @@ pub fn handle_swap_reply(deps: DepsMut, env: Env) -> Result<Response, ContractEr
     let swap_deposit_merge_state = SWAP_DEPOSIT_MERGE_STATE.load(deps.storage)?;
     SWAP_DEPOSIT_MERGE_STATE.remove(deps.storage);
     let pool_config = POOL_CONFIG.load(deps.storage)?;
-    let unused_pair_balances = get_unused_pair_balances(&deps, &env, &pool_config)?;
+    let unused_pair_balances = get_unused_pair_balances(&deps.as_ref(), &env, &pool_config)?;
 
     let create_position_msg = create_position(
         deps,
diff --git a/smart-contracts/osmosis/contracts/cl-vault/src/vault/withdraw.rs b/smart-contracts/osmosis/contracts/cl-vault/src/vault/withdraw.rs
index b62d905c1..6a26f44e1 100644
--- a/smart-contracts/osmosis/contracts/cl-vault/src/vault/withdraw.rs
+++ b/smart-contracts/osmosis/contracts/cl-vault/src/vault/withdraw.rs
@@ -54,7 +54,7 @@ pub fn execute_withdraw(
     // get the dust amounts belonging to the user
     let pool_config = POOL_CONFIG.load(deps.storage)?;
     // TODO replace dust with queries for balance
-    let unused_balances = get_unused_balances(&deps.querier, env)?;
+    let unused_balances = get_unused_balances(&deps.querier, &env.contract.address)?;
     let dust0: Uint256 = unused_balances.find(&pool_config.token0).amount.into();
     let dust1: Uint256 = unused_balances.find(&pool_config.token1).amount.into();