diff --git a/warp/validators/state.go b/warp/validators/state.go
new file mode 100644
index 0000000000..c2929a5807
--- /dev/null
+++ b/warp/validators/state.go
@@ -0,0 +1,51 @@
+// (c) 2023, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package validators
+
+import (
+	"context"
+
+	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/snow"
+	"github.com/ava-labs/avalanchego/snow/validators"
+	"github.com/ava-labs/avalanchego/utils/constants"
+)
+
+var _ validators.State = (*State)(nil)
+
+// State provides a special case used to handle Avalanche Warp Message verification for messages sent
+// from the Primary Network. Subnets have strictly fewer validators than the Primary Network, so we require
+// signatures from a threshold of the RECEIVING subnet validator set rather than the full Primary Network
+// since the receiving subnet already relies on a majority of its validators being correct.
+type State struct {
+	chainContext *snow.Context
+	validators.State
+}
+
+// NewState returns a wrapper of [validators.State] which special cases the handling of the Primary Network.
+//
+// The wrapped state will return the chainContext's Subnet validator set instead of the Primary Network when
+// the Primary Network SubnetID is passed in.
+func NewState(chainContext *snow.Context) *State {
+	return &State{
+		chainContext: chainContext,
+		State:        chainContext.ValidatorState,
+	}
+}
+
+func (s *State) GetValidatorSet(
+	ctx context.Context,
+	height uint64,
+	subnetID ids.ID,
+) (map[ids.NodeID]*validators.GetValidatorOutput, error) {
+	// If the subnetID is anything other than the Primary Network, this is a direct
+	// passthrough
+	if subnetID != constants.PrimaryNetworkID {
+		return s.State.GetValidatorSet(ctx, height, subnetID)
+	}
+
+	// If the requested subnet is the primary network, then we return the validator
+	// set for the Subnet that is receiving the message instead.
+	return s.State.GetValidatorSet(ctx, height, s.chainContext.SubnetID)
+}