diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index c6fa18d56..13d5a76c9 100644
--- a/models/migrations/v17.go
+++ b/models/migrations/v17.go
@@ -12,7 +12,7 @@ import (
 
 func removeInvalidProtectBranchWhitelist(x *xorm.Engine) error {
 	_, err := x.Exec("DELETE FROM protect_branch_whitelist WHERE protect_branch_id = 0")
-	if err != nil && strings.Contains(err.Error(), "no such table") {
+	if err != nil && (strings.Contains(err.Error(), "no such table") || strings.Contains(err.Error(), "doesn't exist")) {
 		return nil
 	}
 	return err