diff --git a/app/models/site.rb b/app/models/site.rb
index c99bc14..d806863 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -458,7 +458,13 @@ class Site < ApplicationRecord
     return unless design_id_changed?
 
     new_configuration = configuration.dup
-    new_configuration['theme'] = design.gem
+
+    if design.no_theme?
+      new_configuration['theme'] = design.gem
+    else
+      new_configuration.delete 'theme'
+    end
+
     new_site = Jekyll::Site.new(new_configuration)
     new_site.read
     new_site.documents.map(&:read!)
diff --git a/db/seeds.rb b/db/seeds.rb
index 01b0afe..214bbcb 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -22,6 +22,6 @@ unless Rails.env.test?
 
     site.update licencia: Licencia.first, design: Design.first,
                 title: site.name, description: 'x' * 50,
-                deploys: [DeployLocal.new]
+                deploys: site.deploys.empty? ? [DeployLocal.new] : site.deploys
   end
 end