diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
index d43ffcaf..8fa28d09 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
@@ -61,12 +61,11 @@ protected override void Initialize(ODataContext context, ODataPath path)
         /// <inheritdoc/>
         protected override void SetTags(OpenApiOperation operation)
         {
-            if (EntitySet == null)
+            if (IsNavigationPropertyPath)
             {
-                // Singleton
                 base.SetTags(operation);
             }
-            else // Entityset
+            else
             {
                 string tagIdentifier = EntitySet.Name + "." + EntitySet.EntityType().Name;