diff --git a/pkg/server/mapper.go b/pkg/server/mapper.go
index 0c2694ad..832554a1 100644
--- a/pkg/server/mapper.go
+++ b/pkg/server/mapper.go
@@ -17,6 +17,10 @@ type defaultMapper struct {
 }
 
 func (d *defaultMapper) FromInternal(data map[string]interface{}) {
+	if t, ok := data["type"]; ok {
+		data["_type"] = t
+	}
+
 	if _, ok := data["id"]; ok || data == nil {
 		return
 	}