diff --git a/src/registry.rs b/src/registry.rs
index d3b0bed3..fca322f8 100644
--- a/src/registry.rs
+++ b/src/registry.rs
@@ -467,17 +467,10 @@ impl Registry {
                 keys,
                 ..
             } => {
-                if name.starts_with("__") {
-                    return;
-                }
-                if name == "_Service" {
-                    return;
-                }
-                if fields.len() == 4 {
+                if name == &self.query_type && fields.len() == 4 {
                     // Is empty query root, only __schema, __type, _service, _entities fields
                     return;
                 }
-
                 if *extends {
                     write!(sdl, "extend ").ok();
                 }