diff --git a/scripts/upgrade-test.sh b/scripts/upgrade-test.sh
index c7838eea..409a18ac 100755
--- a/scripts/upgrade-test.sh
+++ b/scripts/upgrade-test.sh
@@ -16,7 +16,7 @@ export GOMODCACHE=${ROOT}/../_build/gocache
 
 mkdir -p ../_build/old
 git checkout $OLD_VERSION
-make build
+go build -mod=readonly -o build/canined ./cmd/canined
 mv build/canined ./../_build/old/canined
 git checkout $NEW_VERSION
 make install
diff --git a/x/rns/keeper/grpc_query_list_owned_names.go b/x/rns/keeper/grpc_query_list_owned_names.go
index f09c9f91..5c9e6923 100644
--- a/x/rns/keeper/grpc_query_list_owned_names.go
+++ b/x/rns/keeper/grpc_query_list_owned_names.go
@@ -53,8 +53,10 @@ func (k Keeper) ListOwnedNames(goCtx context.Context, req *types.QueryListOwnedN
 		}
 
 		if names.Value == req.Address {
-			namess = append(namess, names)
-			i++
+			if names.Expires < ctx.BlockHeight() {
+				namess = append(namess, names)
+				i++
+			}
 		}
 
 	}