diff --git a/src/libs/github-contribution-stats/github-contribution-stats.js b/src/libs/github-contribution-stats/github-contribution-stats.js
index 3dc2d862..69a5efdf 100644
--- a/src/libs/github-contribution-stats/github-contribution-stats.js
+++ b/src/libs/github-contribution-stats/github-contribution-stats.js
@@ -5,7 +5,7 @@ const stats = issues.reduce((result, issue) => {
   const isPullRequest = 'pull_request' in issue
   const pullRequestIncrement = isPullRequest ? 1 : 0
   const issueIncrement = !isPullRequest ? 1 : 0
-  const pullRequestDate = isPullRequest ? new Date(issue['closed_at']) : new Date()
+  const pullRequestDate = isPullRequest && issue['closed_at'] ? new Date(Date.parse(issue['closed_at'])) : new Date()
 
   if (result && user in result) {
     result[user]['issues'] += issueIncrement
diff --git a/src/views/person.11tydata.js b/src/views/person.11tydata.js
index 6971698b..88b18004 100644
--- a/src/views/person.11tydata.js
+++ b/src/views/person.11tydata.js
@@ -169,13 +169,15 @@ module.exports = {
 
     badgesFields: function (data) {
       const { contributionStat } = data
-      const releaseDate = new Date('2021-10-12T00:00:00Z')
-      const theFirstDate = new Date('1970-01-01T00:00:00Z')
-      let pullRequestDate = releaseDate
-      if (contributionStat && !contributionStat['first'] === theFirstDate) {
-        pullRequestDate = contributionStat
-      }
-      const githubFirstContribution = pullRequestDate
+      const releaseDate = Date.parse('2021-10-12T00:00:00Z')
+      const theFirstDate = Date.parse('1970-01-01T00:00:00Z')
+
+      const pullRequestDate = contributionStat
+        ? Date.parse(contributionStat['first']) !== theFirstDate
+          ? contributionStat['first']
+          : releaseDate
+        : releaseDate
+      const githubFirstContribution = new Date(pullRequestDate)
         .toLocaleString('ru', {
           year: 'numeric',
           month: 'long',