diff --git a/extensions/tags/js/forum/dist/extension.js b/extensions/tags/js/forum/dist/extension.js
index 589bed281..3b66dd36f 100644
--- a/extensions/tags/js/forum/dist/extension.js
+++ b/extensions/tags/js/forum/dist/extension.js
@@ -49,9 +49,16 @@ System.register('flarum/tags/addTagComposer', ['flarum/extend', 'flarum/componen
     override(DiscussionComposer.prototype, 'onsubmit', function (original) {
       var _this2 = this;
 
-      if (!this.tags.length) {
+      var chosenTags = this.tags;
+      var chosenPrimaryTags = chosenTags.filter(function (tag) {
+        return tag.position() !== null && !tag.isChild();
+      });
+      var chosenSecondaryTags = chosenTags.filter(function (tag) {
+        return tag.position() === null;
+      });
+      if (!chosenTags.length || chosenPrimaryTags.length < app.forum.attribute('minPrimaryTags') || chosenSecondaryTags.length < app.forum.attribute('minSecondaryTags')) {
         app.modal.show(new TagDiscussionModal({
-          selectedTags: [],
+          selectedTags: chosenTags,
           onsubmit: function onsubmit(tags) {
             _this2.tags = tags;
             original();
diff --git a/extensions/tags/js/forum/src/addTagComposer.js b/extensions/tags/js/forum/src/addTagComposer.js
index 1d523684a..5ee92f9c0 100644
--- a/extensions/tags/js/forum/src/addTagComposer.js
+++ b/extensions/tags/js/forum/src/addTagComposer.js
@@ -43,10 +43,15 @@ export default function() {
   });
 
   override(DiscussionComposer.prototype, 'onsubmit', function(original) {
-    if (!this.tags.length) {
+    const chosenTags = this.tags;
+    const chosenPrimaryTags = chosenTags.filter(tag => tag.position() !== null && !tag.isChild());
+    const chosenSecondaryTags = chosenTags.filter(tag => tag.position() === null);
+    if (!chosenTags.length
+      || (chosenPrimaryTags.length < app.forum.attribute('minPrimaryTags'))
+      || (chosenSecondaryTags.length < app.forum.attribute('minSecondaryTags'))) {
       app.modal.show(
         new TagDiscussionModal({
-          selectedTags: [],
+          selectedTags: chosenTags,
           onsubmit: tags => {
             this.tags = tags;
             original();
diff --git a/extensions/tags/src/Listener/UpdateTagMetadata.php b/extensions/tags/src/Listener/UpdateTagMetadata.php
index 6a6dea51c..3223093a1 100755
--- a/extensions/tags/src/Listener/UpdateTagMetadata.php
+++ b/extensions/tags/src/Listener/UpdateTagMetadata.php
@@ -11,7 +11,6 @@
 
 namespace Flarum\Tags\Listener;
 
-use Flarum\Core\Post;
 use Flarum\Event\DiscussionWasDeleted;
 use Flarum\Event\DiscussionWasStarted;
 use Flarum\Event\PostWasDeleted;