diff --git a/client/snapshot/load.go b/client/snapshot/load.go
index ba37d21406..0f638b0e6a 100644
--- a/client/snapshot/load.go
+++ b/client/snapshot/load.go
@@ -4,6 +4,7 @@ import (
 	"archive/tar"
 	"bytes"
 	"compress/gzip"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -80,7 +81,7 @@ func LoadArchiveCmd() *cobra.Command {
 			for i := uint32(0); i < snapshot.Chunks; i++ {
 				hdr, err = tr.Next()
 				if err != nil {
-					if err == io.EOF {
+					if errors.Is(err, io.EOF) {
 						break
 					}
 					return err
diff --git a/orm/encoding/ormfield/string.go b/orm/encoding/ormfield/string.go
index 6139277f12..4c3f5b72b2 100644
--- a/orm/encoding/ormfield/string.go
+++ b/orm/encoding/ormfield/string.go
@@ -1,6 +1,7 @@
 package ormfield
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"strings"
@@ -69,7 +70,7 @@ func (s NonTerminalStringCodec) Decode(r Reader) (protoreflect.Value, error) {
 	var bz []byte
 	for {
 		b, err := r.ReadByte()
-		if b == 0 || err == io.EOF {
+		if b == 0 || errors.Is(err, io.EOF) {
 			return protoreflect.ValueOfString(string(bz)), err
 		}
 		bz = append(bz, b)
diff --git a/orm/encoding/ormkv/index_key.go b/orm/encoding/ormkv/index_key.go
index bcb2341ecc..b8f47c83b6 100644
--- a/orm/encoding/ormkv/index_key.go
+++ b/orm/encoding/ormkv/index_key.go
@@ -2,6 +2,7 @@ package ormkv
 
 import (
 	"bytes"
+	"errors"
 	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -64,7 +65,7 @@ func NewIndexKeyCodec(prefix []byte, messageType protoreflect.MessageType, index
 func (cdc IndexKeyCodec) DecodeIndexKey(k, _ []byte) (indexFields, primaryKey []protoreflect.Value, err error) {
 	values, err := cdc.DecodeKey(bytes.NewReader(k))
 	// got prefix key
-	if err == io.EOF {
+	if errors.Is(err, io.EOF) {
 		return values, nil, nil
 	} else if err != nil {
 		return nil, nil, err
diff --git a/orm/encoding/ormkv/key_codec.go b/orm/encoding/ormkv/key_codec.go
index b1056aaf3a..c6d03e3714 100644
--- a/orm/encoding/ormkv/key_codec.go
+++ b/orm/encoding/ormkv/key_codec.go
@@ -2,6 +2,7 @@ package ormkv
 
 import (
 	"bytes"
+	"errors"
 	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -122,7 +123,7 @@ func (cdc *KeyCodec) DecodeKey(r *bytes.Reader) ([]protoreflect.Value, error) {
 	values := make([]protoreflect.Value, 0, n)
 	for i := 0; i < n; i++ {
 		value, err := cdc.fieldCodecs[i].Decode(r)
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			return values, err
 		} else if err != nil {
 			return nil, err
diff --git a/orm/encoding/ormkv/primary_key.go b/orm/encoding/ormkv/primary_key.go
index 6c02d7e6b3..1730f7f0c1 100644
--- a/orm/encoding/ormkv/primary_key.go
+++ b/orm/encoding/ormkv/primary_key.go
@@ -2,6 +2,7 @@ package ormkv
 
 import (
 	"bytes"
+	"errors"
 	"io"
 
 	"google.golang.org/protobuf/proto"
@@ -38,7 +39,7 @@ func (p PrimaryKeyCodec) DecodeIndexKey(k, _ []byte) (indexFields, primaryKey []
 	indexFields, err = p.DecodeKey(bytes.NewReader(k))
 
 	// got prefix key
-	if err == io.EOF {
+	if errors.Is(err, io.EOF) {
 		return indexFields, nil, nil
 	} else if err != nil {
 		return nil, nil, err
@@ -54,7 +55,7 @@ func (p PrimaryKeyCodec) DecodeIndexKey(k, _ []byte) (indexFields, primaryKey []
 
 func (p PrimaryKeyCodec) DecodeEntry(k, v []byte) (Entry, error) {
 	values, err := p.DecodeKey(bytes.NewReader(k))
-	if err == io.EOF {
+	if errors.Is(err, io.EOF) {
 		return &PrimaryKeyEntry{
 			TableName: p.messageType.Descriptor().FullName(),
 			Key:       values,
diff --git a/orm/encoding/ormkv/unique_key.go b/orm/encoding/ormkv/unique_key.go
index 7a8955d1a5..94a6a08997 100644
--- a/orm/encoding/ormkv/unique_key.go
+++ b/orm/encoding/ormkv/unique_key.go
@@ -2,6 +2,7 @@ package ormkv
 
 import (
 	"bytes"
+	"errors"
 	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -87,7 +88,7 @@ func (u UniqueKeyCodec) DecodeIndexKey(k, v []byte) (indexFields, primaryKey []p
 	ks, err := u.keyCodec.DecodeKey(bytes.NewReader(k))
 
 	// got prefix key
-	if err == io.EOF {
+	if errors.Is(err, io.EOF) {
 		return ks, nil, err
 	} else if err != nil {
 		return nil, nil, err
diff --git a/server/grpc/gogoreflection/serverreflection.go b/server/grpc/gogoreflection/serverreflection.go
index c5db746ef8..559548cb31 100644
--- a/server/grpc/gogoreflection/serverreflection.go
+++ b/server/grpc/gogoreflection/serverreflection.go
@@ -34,6 +34,7 @@ package gogoreflection
 import (
 	"bytes"
 	"compress/gzip"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -375,7 +376,7 @@ func (s *serverReflectionServer) ServerReflectionInfo(stream rpb.ServerReflectio
 	sentFileDescriptors := make(map[string]bool)
 	for {
 		in, err := stream.Recv()
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			return nil
 		}
 		if err != nil {
diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
index 0a9b52d593..cfcc5f47b8 100644
--- a/store/rootmulti/store.go
+++ b/store/rootmulti/store.go
@@ -874,7 +874,7 @@ func (rs *Store) Snapshot(height uint64, protoWriter protoio.Writer) error {
 			nodeCount := 0
 			for {
 				node, err := exporter.Next()
-				if err == iavltree.ErrorExportDone {
+				if errors.Is(err, iavltree.ErrorExportDone) {
 					rs.logger.Debug("snapshot Done", "store", store.name, "nodeCount", nodeCount)
 					break
 				} else if err != nil {
@@ -920,7 +920,7 @@ loop:
 	for {
 		snapshotItem = snapshottypes.SnapshotItem{}
 		err := protoReader.ReadMsg(&snapshotItem)
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		} else if err != nil {
 			return snapshottypes.SnapshotItem{}, errorsmod.Wrap(err, "invalid protobuf message")
diff --git a/store/snapshots/chunk.go b/store/snapshots/chunk.go
index fdf8cbd4b9..3a4981b728 100644
--- a/store/snapshots/chunk.go
+++ b/store/snapshots/chunk.go
@@ -149,7 +149,7 @@ func (r *ChunkReader) Read(p []byte) (int, error) {
 		}
 	}
 	n, err := r.reader.Read(p)
-	if err == io.EOF {
+	if errors.IsOf(err, io.EOF) {
 		err = r.reader.Close()
 		r.reader = nil
 		if err != nil {
diff --git a/store/snapshots/helpers_test.go b/store/snapshots/helpers_test.go
index d337b53ab7..af623b0256 100644
--- a/store/snapshots/helpers_test.go
+++ b/store/snapshots/helpers_test.go
@@ -127,7 +127,7 @@ func (m *mockSnapshotter) Restore(
 	for {
 		item.Reset()
 		err := protoReader.ReadMsg(&item)
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		} else if err != nil {
 			return snapshottypes.SnapshotItem{}, errorsmod.Wrap(err, "invalid protobuf message")
@@ -312,7 +312,7 @@ func (s *extSnapshotter) SnapshotExtension(height uint64, payloadWriter snapshot
 func (s *extSnapshotter) RestoreExtension(height uint64, format uint32, payloadReader snapshottypes.ExtensionPayloadReader) error {
 	for {
 		payload, err := payloadReader()
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		} else if err != nil {
 			return err
diff --git a/store/v2/snapshots/chunk.go b/store/v2/snapshots/chunk.go
index aab00a3e5d..9049460a18 100644
--- a/store/v2/snapshots/chunk.go
+++ b/store/v2/snapshots/chunk.go
@@ -1,6 +1,7 @@
 package snapshots
 
 import (
+	stderrors "errors"
 	"io"
 	"math"
 
@@ -149,7 +150,7 @@ func (r *ChunkReader) Read(p []byte) (int, error) {
 		}
 	}
 	n, err := r.reader.Read(p)
-	if err == io.EOF {
+	if stderrors.Is(err, io.EOF) {
 		err = r.reader.Close()
 		r.reader = nil
 		if err != nil {
diff --git a/store/v2/snapshots/helpers_test.go b/store/v2/snapshots/helpers_test.go
index 156014af5d..00feb0c086 100644
--- a/store/v2/snapshots/helpers_test.go
+++ b/store/v2/snapshots/helpers_test.go
@@ -123,7 +123,7 @@ func (m *mockCommitSnapshotter) Restore(
 	for {
 		item.Reset()
 		err := protoReader.ReadMsg(&item)
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		} else if err != nil {
 			return snapshotstypes.SnapshotItem{}, errorsmod.Wrap(err, "invalid protobuf message")
@@ -277,7 +277,7 @@ func (s *extSnapshotter) SnapshotExtension(height uint64, payloadWriter snapshot
 func (s *extSnapshotter) RestoreExtension(height uint64, format uint32, payloadReader snapshots.ExtensionPayloadReader) error {
 	for {
 		payload, err := payloadReader()
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		} else if err != nil {
 			return err
diff --git a/tools/hubl/internal/compat.go b/tools/hubl/internal/compat.go
index 856dd9b800..b67e7adfd8 100644
--- a/tools/hubl/internal/compat.go
+++ b/tools/hubl/internal/compat.go
@@ -2,6 +2,7 @@ package internal
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"strings"
@@ -47,7 +48,7 @@ func loadFileDescriptorsGRPCReflection(ctx context.Context, client *grpc.ClientC
 	go func() {
 		for {
 			in, err := reflectClient.Recv()
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				// read done.
 				close(waitc)
 				return
@@ -172,7 +173,7 @@ func addMissingFileDescriptors(ctx context.Context, client *grpc.ClientConn, fdM
 	go func() {
 		for {
 			in, err := reflectClient.Recv()
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				// read done.
 				close(waitc)
 				return