diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61306df..83a443a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.0] - 2025-03-27
+### Added
+- Added `skinApplyDelayOnJoin` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#skinapplydelayonjoin))
+### Changed
+- Updated to 1.21.5
+### Removed
+- [NeoForge] Dropped support for NeoForge on Minecraft 1.20.5-1.20.6
+
 ## [2.2.1] - 2024-12-23
 ### Fixed
 - Fixed game not closing because of mineskin working threads (closes [#41](https://github.com/Suiranoil/SkinRestorer/issues/41))
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 8920438..7b956fe 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -1,2 +1,6 @@
-### Fixed
-- Fixed game not closing because of mineskin working threads (closes [#41](https://github.com/Suiranoil/SkinRestorer/issues/41))
+### Added
+- Added `skinApplyDelayOnJoin` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#skinapplydelayonjoin))
+### Changed
+- Updated to 1.21.5
+### Removed
+- [NeoForge] Dropped support for NeoForge on Minecraft 1.20.5-1.20.6
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
index 22286e8..90539e7 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
@@ -41,11 +41,11 @@ public abstract class PlayerListMixin {
     @Inject(method = "placeNewPlayer", at = @At("HEAD"))
     private void placeNewPlayer(Connection connection, ServerPlayer player, CallbackInfo ci) {
         var delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
-        var uuid = player.getUUID();
         
         if (delay <= 0) {
             skinrestorer$tryApplySkin(server, player);
         } else {
+            var uuid = player.getUUID();
             ServerUtils.scheduleServerTask(server, () -> {
                 var actualPlayer = server.getPlayerList().getPlayer(uuid);
                 if (actualPlayer != null)
diff --git a/gradle.properties b/gradle.properties
index 261786d..2a211f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ minecraft_version_list=1.20,1.20.1
 minecraft_version_range=[1.20, 1.20.1]
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.2.1
+mod_version=2.3.0
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer