diff --git a/pkg/loop/internal/core/services/capability/standard/standard_capabilities.go b/pkg/loop/internal/core/services/capability/standard/standard_capabilities.go
index 292cbaef18..0debcd303d 100644
--- a/pkg/loop/internal/core/services/capability/standard/standard_capabilities.go
+++ b/pkg/loop/internal/core/services/capability/standard/standard_capabilities.go
@@ -69,6 +69,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
 	oracleFactory := dependencies.OracleFactory
 	gatewayConnector := dependencies.GatewayConnector
 	p2pKeystore := dependencies.P2PKeystore
+	orgResolver := dependencies.OrgResolver
 	telemetryID, telemetryRes, err := c.ServeNew("Telemetry", func(s *grpc.Server) {
 		pb.RegisterTelemetryServer(s, telemetry.NewTelemetryServer(telemetryService))
 	})
@@ -158,7 +159,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
 	resources = append(resources, gatewayConnectorRes)
 
 	orgResolverID, orgResolverRes, err := c.ServeNew("OrgResolver", func(s *grpc.Server) {
-		pb.RegisterOrgResolverServer(s, orgresolver.NewServer(dependencies.OrgResolver))
+		pb.RegisterOrgResolverServer(s, orgresolver.NewServer(orgResolver))
 	})
 	if err != nil {
 		c.CloseAll(resources...)
diff --git a/pkg/loop/internal/core/services/orgresolver/server.go b/pkg/loop/internal/core/services/orgresolver/server.go
index 9bbc425de7..f97039797b 100644
--- a/pkg/loop/internal/core/services/orgresolver/server.go
+++ b/pkg/loop/internal/core/services/orgresolver/server.go
@@ -2,6 +2,7 @@ package orgresolver
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
@@ -19,6 +20,10 @@ func NewServer(impl orgresolver.OrgResolver) *Server {
 }
 
 func (s *Server) Get(ctx context.Context, req *pb.GetOrganizationRequest) (*pb.GetOrganizationResponse, error) {
+	if s.impl == nil {
+		// Return error when orgResolver implementation is nil
+		return nil, fmt.Errorf("orgResolver implementation is nil - service may not be configured")
+	}
 	orgID, err := s.impl.Get(ctx, req.Owner)
 	if err != nil {
 		return nil, err