diff --git a/lib/snikket.rb b/lib/snikket.rb
index 2371470e643732ce14c59f0e1d51ca2b4e3298b0..804b8a271f57277731f5841e77b360caf8c79ae4 100644
--- a/lib/snikket.rb
+++ b/lib/snikket.rb
@@ -203,9 +203,11 @@ module Snikket
 
 		def self.new(type=nil, to=nil, id=nil, domain: nil)
 			stanza = super(type || :get, to, id)
-			node = Nokogiri::XML::Node.new("domain-info", stanza.document)
-			node.default_namespace = registered_ns
-			stanza << node
+			if domain
+				node = Nokogiri::XML::Node.new("domain-info", stanza.document)
+				node.default_namespace = registered_ns
+				stanza << node
+			end
 			stanza.domain = domain if domain
 			stanza
 		end