diff --git a/config/foreman.migrations/20210708144320_add_foreman_puppet.rb b/config/foreman.migrations/20210708144320_add_foreman_puppet.rb
index 749dc1306..578a586c7 100644
--- a/config/foreman.migrations/20210708144320_add_foreman_puppet.rb
+++ b/config/foreman.migrations/20210708144320_add_foreman_puppet.rb
@@ -1,3 +1,3 @@
 unless answers.key?('foreman::plugin::puppet')
-  answers['foreman::plugin::puppet'] = true
+  answers['foreman::plugin::puppet'] = (answers['foreman'] != false)
 end
diff --git a/config/katello.migrations/210708144422-add-foreman-puppet.rb b/config/katello.migrations/210708144422-add-foreman-puppet.rb
index 749dc1306..578a586c7 100644
--- a/config/katello.migrations/210708144422-add-foreman-puppet.rb
+++ b/config/katello.migrations/210708144422-add-foreman-puppet.rb
@@ -1,3 +1,3 @@
 unless answers.key?('foreman::plugin::puppet')
-  answers['foreman::plugin::puppet'] = true
+  answers['foreman::plugin::puppet'] = (answers['foreman'] != false)
 end