diff --git a/lib/discourse_dev/tag.rb b/lib/discourse_dev/tag.rb
index 5072ac0..c4c43ae 100644
--- a/lib/discourse_dev/tag.rb
+++ b/lib/discourse_dev/tag.rb
@@ -11,6 +11,11 @@ def initialize
       super(::Tag, DiscourseDev.config.tag[:count])
     end
 
+    def populate!
+      return unless SiteSetting.tagging_enabled
+      super
+    end
+
     def data
       {
         name: Faker::Discourse.unique.tag,
diff --git a/lib/discourse_dev/topic.rb b/lib/discourse_dev/topic.rb
index da2e492..ba497fc 100644
--- a/lib/discourse_dev/topic.rb
+++ b/lib/discourse_dev/topic.rb
@@ -53,6 +53,8 @@ def title
     end
 
     def tags
+      return unless SiteSetting.tagging_enabled
+
       @tags = []
 
       Faker::Number.between(from: @settings.dig(:tags, :min), to: @settings.dig(:tags, :max)).times do