diff --git a/model/version.go b/model/version.go
index 63b1140015..c40869d0d8 100644
--- a/model/version.go
+++ b/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maitained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"4.0.0",
 	"3.10.0",
 	"3.9.0",
 	"3.8.0",
diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go
index ef255c5c25..4634158513 100644
--- a/store/sql_upgrade.go
+++ b/store/sql_upgrade.go
@@ -272,9 +272,7 @@ func UpgradeDatabaseToVersion310(sqlStore SqlStore) {
 }
 
 func UpgradeDatabaseToVersion40(sqlStore SqlStore) {
-	// TODO: Uncomment following condition when version 4.0.0 is released
-	//if shouldPerformUpgrade(sqlStore, VERSION_3_10_0, VERSION_4_0_0) {
-
-	//	saveSchemaVersion(sqlStore, VERSION_4_0_0)
-	//}
+	if shouldPerformUpgrade(sqlStore, VERSION_3_10_0, VERSION_4_0_0) {
+		saveSchemaVersion(sqlStore, VERSION_4_0_0)
+	}
 }