diff --git a/command/agent/local.go b/command/agent/local.go
index 5815367229..e456ebb2e5 100644
--- a/command/agent/local.go
+++ b/command/agent/local.go
@@ -368,7 +368,8 @@ func (l *localState) setSyncState() error {
 
 	// Check the node info (currently limited to tagged addresses since
 	// everything else is managed by the Serf layer)
-	if !reflect.DeepEqual(out1.NodeServices.Node.TaggedAddresses, l.config.TaggedAddresses) {
+	if out1.NodeServices == nil || out1.NodeServices.Node == nil ||
+		!reflect.DeepEqual(out1.NodeServices.Node.TaggedAddresses, l.config.TaggedAddresses) {
 		l.nodeInfoInSync = false
 	}