diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java
index 906e9dd0..fce34f12 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java
@@ -30,7 +30,13 @@ public class MountPetEvent extends MessageHandler {
 
         //dismount
         if (habbo.getHabboInfo().getRiding() != null) {
+            boolean mountAgain = petId != habbo.getHabboInfo().getRiding().getId();
+
             habbo.getHabboInfo().dismountPet(room);
+
+            if(!mountAgain) {
+                return;
+            }
         }
 
         // someone is already on it