diff --git a/libwallet/instantswap/instantswap.go b/libwallet/instantswap/instantswap.go
index f963474a1..e43d5542b 100644
--- a/libwallet/instantswap/instantswap.go
+++ b/libwallet/instantswap/instantswap.go
@@ -129,7 +129,6 @@ func (instantSwap *InstantSwap) NewExchangeServer(exchangeServer ExchangeServer)
 // If status is specified, only orders with that status will be returned.
 // status is made optional to the sync functionality can update all orders.
 func (instantSwap *InstantSwap) GetOrdersRaw(offset, limit int32, newestFirst bool, server, txID string, status ...instantswap.Status) ([]*Order, error) {
-	var query storm.Query
 	matchers := make([]q.Matcher, 0)
 
 	if len(status) > 0 {
@@ -148,6 +147,7 @@ func (instantSwap *InstantSwap) GetOrdersRaw(offset, limit int32, newestFirst bo
 		matchers = append(matchers, q.True())
 	}
 
+	var query storm.Query
 	query = instantSwap.db.Select(matchers...)
 
 	if offset > 0 {
diff --git a/ui/page/exchange/order_history_page.go b/ui/page/exchange/order_history_page.go
index 45e139ff2..26e86e364 100644
--- a/ui/page/exchange/order_history_page.go
+++ b/ui/page/exchange/order_history_page.go
@@ -178,7 +178,6 @@ func (pg *OrderHistoryPage) initServerSelector() {
 	pg.exchangeServers = pg.AssetsManager.InstantSwap.ExchangeServers()
 
 	items := []cryptomaterial.DropDownItem{{
-		// Icon: pg.Theme.Icons.WalletIcon,
 		Text: values.String(values.StrAllservers),
 	}}
 	for _, server := range pg.exchangeServers {