diff --git a/agent/local/state.go b/agent/local/state.go
index 69e136816a..8007505167 100644
--- a/agent/local/state.go
+++ b/agent/local/state.go
@@ -341,7 +341,7 @@ func (l *State) AddCheck(check *structs.HealthCheck, token string) error {
 
 	// if there is a serviceID associated with the check, make sure it exists before adding it
 	// NOTE - This logic may be moved to be handled within the Agent's Addcheck method after a refactor
-	if check.ServiceID != "" && l.services[check.ServiceID] == nil {
+	if check.ServiceID != "" && l.Service(check.ServiceID) == nil {
 		return fmt.Errorf("Check %q refers to non-existent service %q", check.CheckID, check.ServiceID)
 	}