diff --git a/command/agent/kvs_endpoint.go b/command/agent/kvs_endpoint.go
index a72b7286c..12c6171e5 100644
--- a/command/agent/kvs_endpoint.go
+++ b/command/agent/kvs_endpoint.go
@@ -47,10 +47,10 @@ func (s *HTTPServer) KVSGet(resp http.ResponseWriter, req *http.Request, args *s
 
 	// Make the RPC
 	var out structs.IndexedDirEntries
-	defer setMeta(resp, &out.QueryMeta)
 	if err := s.agent.RPC(method, &args, &out); err != nil {
 		return nil, err
 	}
+	setMeta(resp, &out.QueryMeta)
 
 	// Check if we get a not found
 	if len(out.Entries) == 0 {