diff --git a/server/service/service_osquery.go b/server/service/service_osquery.go
index e7af372212..0a19c36f3e 100644
--- a/server/service/service_osquery.go
+++ b/server/service/service_osquery.go
@@ -80,7 +80,13 @@ func (svc service) GetClientConfig(ctx context.Context) (*kolide.OsqueryConfig,
 
 	config := &kolide.OsqueryConfig{
 		Options: options,
-		Packs:   kolide.Packs{},
+		Decorators: kolide.Decorators{
+			Load: []string{
+				"SELECT uuid AS host_uuid FROM system_info;",
+				"SELECT hostname AS hostname FROM system_info;",
+			},
+		},
+		Packs: kolide.Packs{},
 	}
 
 	packs, err := svc.ListPacksForHost(ctx, host.ID)