diff --git a/model/version.go b/model/version.go
index d32721e1ad..b8600ec1dc 100644
--- a/model/version.go
+++ b/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"5.11.0",
 	"5.10.0",
 	"5.9.0",
 	"5.8.0",
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 475d3d54db..589a76b238 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -659,24 +659,22 @@ func UpgradeDatabaseToVersion510(sqlStore SqlStore) {
 }
 
 func UpgradeDatabaseToVersion511(sqlStore SqlStore) {
-	// TODO: Uncomment following condition when version 5.11.0 is released
-	// if shouldPerformUpgrade(sqlStore, VERSION_5_10_0, VERSION_5_11_0) {
-
-	// Enforce all teams have an InviteID set
-	var teams []*model.Team
-	if _, err := sqlStore.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE InviteId = ''"); err != nil {
-		mlog.Error("Error fetching Teams without InviteID: " + err.Error())
-	} else {
-		for _, team := range teams {
-			team.InviteId = model.NewId()
-			if _, err := sqlStore.Team().Update(team); err != nil {
-				mlog.Error("Error updating Team InviteIDs: " + err.Error())
+	if shouldPerformUpgrade(sqlStore, VERSION_5_10_0, VERSION_5_11_0) {
+		// Enforce all teams have an InviteID set
+		var teams []*model.Team
+		if _, err := sqlStore.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE InviteId = ''"); err != nil {
+			mlog.Error("Error fetching Teams without InviteID: " + err.Error())
+		} else {
+			for _, team := range teams {
+				team.InviteId = model.NewId()
+				if _, err := sqlStore.Team().Update(team); err != nil {
+					mlog.Error("Error updating Team InviteIDs: " + err.Error())
+				}
 			}
 		}
-	}
 
-	// 	saveSchemaVersion(sqlStore, VERSION_5_11_0)
-	// }
+		saveSchemaVersion(sqlStore, VERSION_5_11_0)
+	}
 }
 
 func UpgradeDatabaseToVersion512(sqlStore SqlStore) {