diff --git a/extensions/tags/src/Listeners/AddApiAttributes.php b/extensions/tags/src/Listeners/AddApiAttributes.php
index 8668b50bd..44f340ddf 100755
--- a/extensions/tags/src/Listeners/AddApiAttributes.php
+++ b/extensions/tags/src/Listeners/AddApiAttributes.php
@@ -60,9 +60,14 @@ class AddApiAttributes
         }
 
         if ($event->action instanceof Discussions\IndexAction ||
-            $event->action instanceof Discussions\ShowAction) {
+            $event->action instanceof Discussions\ShowAction ||
+            $event->action instanceof Discussions\CreateAction) {
             $event->addInclude('tags');
         }
+
+        if ($event->action instanceof Discussions\CreateAction) {
+            $event->addInclude('tags.lastDiscussion');
+        }
     }
 
     public function addAttributes(ApiAttributes $event)