diff --git a/lib/simple_form.rb b/lib/simple_form.rb
index ed4d4df2..b7b97b72 100644
--- a/lib/simple_form.rb
+++ b/lib/simple_form.rb
@@ -142,7 +142,7 @@ module SimpleForm
 
   # Builds a new wrapper using SimpleForm::Wrappers::Builder.
   def self.build(options={})
-    options[:tag] ||= :div unless options.empty?
+    options[:tag] = :div if !options.empty? && options[:tag].nil?
     builder = SimpleForm::Wrappers::Builder.new
     yield builder
     SimpleForm::Wrappers::Root.new(builder.to_a, options)
diff --git a/lib/simple_form/wrappers/builder.rb b/lib/simple_form/wrappers/builder.rb
index d25990e7..e002ccab 100644
--- a/lib/simple_form/wrappers/builder.rb
+++ b/lib/simple_form/wrappers/builder.rb
@@ -35,7 +35,7 @@ module SimpleForm
           name, options = nil, name if name.is_a?(Hash)
           builder = self.class.new
           options ||= {}
-          options[:tag] ||= :div
+          options[:tag] = :div if options[:tag].nil?
           yield builder
           @components << Many.new(name, builder.to_a, options)
         elsif options