diff --git a/app/models/domain.rb b/app/models/domain.rb
index 597822985..c0349eebb 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -133,7 +133,7 @@ class Domain < ActiveRecord::Base
       end
 
       unless DomainStatus::STATUSES.include?(x[:value])
-        add_epp_error('2302', 'status', x[:value], [:domain_statuses, :not_found])
+        add_epp_error('2303', 'status', x[:value], [:domain_statuses, :not_found])
         next
       end
 
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index ac5af6228..b4e20928e 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -501,6 +501,19 @@ describe 'EPP Domain', epp: true do
         expect(d.auth_info).to eq('2BARfoo')
       end
 
+      it 'does not assign invalid status to domain' do
+        xml = domain_update_xml({
+          add: [
+            status: { value: '', attrs: { s: 'invalidStatus' } }
+          ]
+        })
+
+        response = epp_request(xml, :xml)
+        expect(response[:results][0][:result_code]).to eq('2303')
+        expect(response[:results][0][:msg]).to eq('Status was not found')
+        expect(response[:results][0][:value]).to eq('invalidStatus')
+      end
+
       it 'deletes domain' do
         expect(DomainContact.count).to eq(1)
         response = epp_request(domain_delete_xml, :xml)