diff --git a/server/store/datastore/server_config.go b/server/store/datastore/server_config.go
index 6e1eee1d6..eaa9d3e16 100644
--- a/server/store/datastore/server_config.go
+++ b/server/store/datastore/server_config.go
@@ -43,10 +43,7 @@ func (s storage) ServerConfigSet(key, value string) error {
 		return err
 	}
 
-	// TODO change to Where() when https://gitea.com/xorm/xorm/issues/2358 is solved
-	_, err = s.engine.Cols("value").Update(config, &model.ServerConfig{
-		Key: key,
-	})
+	_, err = s.engine.Where("`key` = ?", config.Key).Cols("value").Update(config)
 	return err
 }