diff --git a/Emulator/pom.xml b/Emulator/pom.xml
index 12411054..7d0c83b5 100644
--- a/Emulator/pom.xml
+++ b/Emulator/pom.xml
@@ -10,8 +10,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <build>
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.15.0</version>
                 <configuration>
                     <source>19</source>
                     <target>19</target>
diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitManager.java
index e18b3823..df7fae6b 100644
--- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitManager.java
+++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitManager.java
@@ -12,11 +12,11 @@ import com.eu.habbo.habbohotel.users.DanceType;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboGender;
 import com.eu.habbo.habbohotel.users.HabboItem;
+import com.eu.habbo.habbohotel.wired.WiredUserActionType;
 import com.eu.habbo.habbohotel.wired.core.WiredFreezeUtil;
 import com.eu.habbo.habbohotel.wired.core.WiredManager;
 import com.eu.habbo.habbohotel.wired.core.WiredMoveCarryHelper;
 import com.eu.habbo.habbohotel.wired.core.WiredUserMovementHelper;
-import com.eu.habbo.habbohotel.wired.WiredUserActionType;
 import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer;
 import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
 import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer;
@@ -1262,9 +1262,14 @@ public class RoomUnitManager {
         if (habbo == null || habbo.getRoomUnit() == null) {
             return;
         }
+
+        boolean wasIdle = habbo.getRoomUnit().isIdle();
         habbo.getRoomUnit().resetIdleTimer();
-        this.room.sendComposer(new RoomUnitIdleComposer(habbo.getRoomUnit()).compose());
-        WiredManager.triggerUserUnidles(this.room, habbo.getRoomUnit());
+
+        if (wasIdle) {
+            this.room.sendComposer(new RoomUnitIdleComposer(habbo.getRoomUnit()).compose());
+            WiredManager.triggerUserUnidles(this.room, habbo.getRoomUnit());
+        }
     }
 
     /**
@@ -1446,11 +1451,6 @@ public class RoomUnitManager {
         }
     }
 
-    // ==================== DISPOSAL ====================
-
-    /**
-     * Disposes the unit manager.
-     */
     public void dispose() {
         this.currentHabbos.clear();
         this.currentBots.clear();