diff --git a/lib/models/music_brainz/release.rb b/lib/models/music_brainz/release.rb
index ca373c9..6b6a500 100644
--- a/lib/models/music_brainz/release.rb
+++ b/lib/models/music_brainz/release.rb
@@ -23,9 +23,9 @@ module MusicBrainz
       @release.id = xml.attr('id')
       @release.title = xml.css('title').text unless xml.css('title').empty?
       @release.status = xml.css('status').text unless xml.css('status').empty?
-      date = xml.css('date').empty? ? '9999-12-31' : xml.css('date').text
+      date = xml.css('date').empty? ? '2030-12-31' : xml.css('date').text
       if date.length == 0
-        date = '9999-12-31'
+        date = '2030-12-31'
       elsif date.length == 4
         date += '-12-31'
       elsif date.length == 7
diff --git a/lib/models/music_brainz/release_group.rb b/lib/models/music_brainz/release_group.rb
index a76a6a5..167d237 100644
--- a/lib/models/music_brainz/release_group.rb
+++ b/lib/models/music_brainz/release_group.rb
@@ -24,16 +24,15 @@ module MusicBrainz
       @release_group.type = xml.attr('type')
       @release_group.title = xml.css('title').text
       @release_group.disambiguation = xml.css('disambiguation').empty? ? '' : xml.css('disambiguation').text
-      date = xml.css('first-release-date').empty? ? '9999-12-31' : xml.css('first-release-date').text
+      date = xml.css('first-release-date').empty? ? '2030-12-31' : xml.css('first-release-date').text
       if date.length == 0
-        date = '9999-12-31'
+        date = '2030-12-31'
       elsif date.length == 4
         date += '-12-31'
       elsif date.length == 7
         date += '-31'
       end
       date = date.split('-')
-      p date
       @release_group.first_release_date = Time.utc(date[0], date[1], date[2])
       @release_group
     end