diff --git a/lib/remote/objectqueryhandler.cpp b/lib/remote/objectqueryhandler.cpp
index ef6c937a4..111d284bc 100644
--- a/lib/remote/objectqueryhandler.cpp
+++ b/lib/remote/objectqueryhandler.cpp
@@ -94,12 +94,8 @@ Dictionary::Ptr ObjectQueryHandler::SerializeObjectAttrs(const Object::Ptr& obje
 			continue;
 
 		/* hide internal navigation fields */
-		if (field.Attributes & FANavigation) {
-			Value nval = object->NavigateField(fid);
-
-			if (val == nval)
-				continue;
-		}
+		if (field.Attributes & FANavigation && !(field.Attributes & (FAConfig | FAState)))
+			continue;
 
 		Value sval = Serialize(val, FAConfig | FAState);
 		resultAttrs->Set(field.Name, sval);