diff --git a/src/Swagger/Serializer/DocumentationNormalizer.php b/src/Swagger/Serializer/DocumentationNormalizer.php
index 6976239441a..89033dbf546 100644
--- a/src/Swagger/Serializer/DocumentationNormalizer.php
+++ b/src/Swagger/Serializer/DocumentationNormalizer.php
@@ -127,7 +127,11 @@ public function normalize($object, $format = null, array $context = [])
                 $responseDefinitionKey = $this->getDefinition($definitions, $subResourceMetadata, $subresourceOperation['resource_class'], $serializerContext);
 
                 $pathOperation = new \ArrayObject([]);
-                $pathOperation['tags'] = $subresourceOperation['shortNames'];
+                if (isset($subresourceOperation['shortNames'][1])) {
+                    $pathOperation['tags'] = [$subresourceOperation['shortNames'][1]];
+                } else {
+                    $pathOperation['tags'] = [$subresourceOperation['shortNames'][0]];
+                }
                 $pathOperation['operationId'] = $operationId;
                 $pathOperation['produces'] = $mimeTypes;
                 $pathOperation['summary'] = sprintf('Retrieves %s%s resource%s.', $subresourceOperation['collection'] ? 'the collection of ' : 'a ', $subresourceOperation['shortNames'][0], $subresourceOperation['collection'] ? 's' : '');
diff --git a/tests/Swagger/Serializer/DocumentationNormalizerTest.php b/tests/Swagger/Serializer/DocumentationNormalizerTest.php
index 39eb21c1129..8dfcf3d6d26 100644
--- a/tests/Swagger/Serializer/DocumentationNormalizerTest.php
+++ b/tests/Swagger/Serializer/DocumentationNormalizerTest.php
@@ -1735,7 +1735,7 @@ public function testNormalizeWithSubResource()
                 ],
                 '/api/questions/{id}/answer' => new \ArrayObject([
                     'get' => new \ArrayObject([
-                        'tags' => ['Answer', 'Question'],
+                        'tags' => ['Question'],
                         'operationId' => 'api_questions_answer_get_subresource',
                         'produces' => ['application/ld+json'],
                         'summary' => 'Retrieves a Answer resource.',