diff --git a/cmd/jaeger/internal/integration/grpc_test.go b/cmd/jaeger/internal/integration/grpc_test.go
index ec3f8f8d0c8..52e446592ad 100644
--- a/cmd/jaeger/internal/integration/grpc_test.go
+++ b/cmd/jaeger/internal/integration/grpc_test.go
@@ -18,9 +18,7 @@ type GRPCStorageIntegration struct {
 }
 
 func (s *GRPCStorageIntegration) initialize(t *testing.T) {
-	var err error
-	s.server, err = integration.NewGRPCServer()
-	require.NoError(t, err)
+	s.server = integration.NewGRPCServer()
 	require.NoError(t, s.server.Start())
 
 	s.Refresh = func(_ *testing.T) {}
diff --git a/plugin/storage/integration/grpc_server.go b/plugin/storage/integration/grpc_server.go
index 7787f74d04b..c974060702d 100644
--- a/plugin/storage/integration/grpc_server.go
+++ b/plugin/storage/integration/grpc_server.go
@@ -16,13 +16,13 @@ import (
 )
 
 type GRPCServer struct {
-	errChan chan error
-	server  *googleGRPC.Server
-	wg      sync.WaitGroup
+	server   *googleGRPC.Server
+	serveErr error
+	wg       sync.WaitGroup
 }
 
-func NewGRPCServer() (*GRPCServer, error) {
-	return &GRPCServer{errChan: make(chan error, 1)}, nil
+func NewGRPCServer() *GRPCServer {
+	return &GRPCServer{}
 }
 
 func (s *GRPCServer) Start() error {
@@ -51,12 +51,7 @@ func (s *GRPCServer) Start() error {
 	s.wg.Add(1)
 	go func() {
 		defer s.wg.Done()
-		if err = s.server.Serve(listener); err != nil {
-			select {
-			case s.errChan <- err:
-			default:
-			}
-		}
+		s.serveErr = s.server.Serve(listener)
 	}()
 	return nil
 }
@@ -69,10 +64,6 @@ func (s *GRPCServer) Close() error {
 	s.server.GracefulStop()
 	s.server = nil
 	s.wg.Wait()
-	select {
-	case err := <-s.errChan:
-		return err
-	default:
-	}
-	return nil
+
+	return s.serveErr
 }
diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
index b0d9b33d1e5..60fddc06803 100644
--- a/plugin/storage/integration/grpc_test.go
+++ b/plugin/storage/integration/grpc_test.go
@@ -133,8 +133,7 @@ func TestGRPCRemoteStorage(t *testing.T) {
 		"--grpc-storage.server=localhost:17271",
 		"--grpc-storage.tls.enabled=false",
 	}
-	server, err := NewGRPCServer()
-	require.NoError(t, err)
+	server := NewGRPCServer()
 
 	s := &GRPCStorageIntegrationTestSuite{
 		flags:  flags,