diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 9e668fcb4b..ba9c47c62d 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -1428,16 +1428,16 @@ func upgradeDatabaseToVersion630(sqlStore *SqlStore) {
 
 		sqlStore.AlterColumnTypeIfExists("PluginKeyValueStore", "PKey", "VARCHAR(150)", "VARCHAR(150)")
 
+		if sqlStore.DoesColumnExist("Users", "AcceptedTermsOfServiceId") {
+			sqlStore.GetMaster().ExecNoTimeout("ALTER TABLE Users DROP COLUMN AcceptedTermsOfServiceId")
+		}
+
 		saveSchemaVersion(sqlStore, Version630)
 	}
 }
 
 func upgradeDatabaseToVersion640(sqlStore *SqlStore) {
 	// if shouldPerformUpgrade(sqlStore, Version630, Version640) {
-	if sqlStore.DoesColumnExist("Users", "AcceptedTermsOfServiceId") {
-		sqlStore.GetMaster().ExecNoTimeout("ALTER TABLE Users DROP COLUMN AcceptedTermsOfServiceId")
-	}
-
 	// 	saveSchemaVersion(sqlStore, Version640)
 	// }
 }