diff --git a/app/models/domain.rb b/app/models/domain.rb
index 18f47e2ac..ff9f7ab56 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -28,7 +28,8 @@ class Domain < ActiveRecord::Base
   has_many :domain_transfers, dependent: :delete_all
 
   has_many :dnskeys, dependent: :delete_all
-  accepts_nested_attributes_for :dnskeys, allow_destroy: true
+  accepts_nested_attributes_for :dnskeys, allow_destroy: true,
+    reject_if: proc { |attrs| attrs[:public_key].blank? }
 
   delegate :code, to: :owner_contact, prefix: true
   delegate :email, to: :owner_contact, prefix: true