diff --git a/common/license/key.go b/common/license/key.go
index 8d53b7af..a51080a9 100644
--- a/common/license/key.go
+++ b/common/license/key.go
@@ -79,7 +79,11 @@ func (k *LicenseKey) Validate() error {
 	}
 
 	if k.ExpiresAt == nil {
-		k.ExpiresAt = &noLicenseExpiry
+		expiresAt := k.CreatedAt.AddDate(1, 0, 0)
+		if noLicenseExpiry.After(expiresAt) {
+			expiresAt = noLicenseExpiry
+		}
+		k.ExpiresAt = &expiresAt
 	}
 
 	if k.CreatedAt.After(*k.ExpiresAt) {
diff --git a/common/version.go b/common/version.go
index d2bcf1a6..0a2b0e34 100644
--- a/common/version.go
+++ b/common/version.go
@@ -11,12 +11,12 @@ import (
 )
 
 const releaseYear = 2020
-const releaseMonth = 2
-const releaseDay = 10
-const releaseHour = 8
-const releaseMin = 50
+const releaseMonth = 3
+const releaseDay = 8
+const releaseHour = 23
+const releaseMin = 40
 
 // Version holds version information, when bumping this make sure to bump the released at stamp also.
-const Version = "3.4.0"
+const Version = "3.5.0"
 
 var ReleasedAt = time.Date(releaseYear, releaseMonth, releaseDay, releaseHour, releaseMin, 0, 0, time.UTC)