diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoRemount.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoRemount.kt
index 54f5093c5..c81a7b73f 100644
--- a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoRemount.kt
+++ b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoRemount.kt
@@ -7,16 +7,19 @@ import com.lambda.client.util.TimeUnit
 import com.lambda.client.util.threads.safeListener
 import net.minecraft.entity.Entity
 import net.minecraft.entity.item.EntityBoat
+import net.minecraft.entity.item.EntityMinecartEmpty
+
 import net.minecraft.entity.passive.*
 import net.minecraft.util.EnumHand
 import net.minecraftforge.fml.common.gameevent.TickEvent
 
 object AutoRemount : Module(
     name = "AutoRemount",
-    description = "Automatically remounts your ridable entity",
+    description = "Automatically remounts your rideable entity",
     category = Category.MOVEMENT
 ) {
     private val boat by setting("Boats", true)
+    private val minecart by setting("Minecarts", true)
     private val horse by setting("Horse", true)
     private val skeletonHorse by setting("Skeleton Horse", true)
     private val donkey by setting("Donkey", true)
@@ -50,13 +53,18 @@ object AutoRemount : Module(
     }
 
     private fun isValidEntity(entity: Entity): Boolean {
-        return boat && entity is EntityBoat
-            || entity is EntityAnimal && !entity.isChild // FBI moment
-            && (horse && entity is EntityHorse
-            || skeletonHorse && entity is EntitySkeletonHorse
-            || donkey && entity is EntityDonkey
-            || mule && entity is EntityMule
-            || pig && entity is EntityPig && entity.saddled
-            || llama && entity is EntityLlama)
+        //check if entity is an animal and not a child
+        val matureAnimalCheck: Boolean = entity is EntityAnimal && !entity.isChild //FBI moment
+        return when (entity) {
+            is EntityBoat -> boat
+            is EntityMinecartEmpty -> minecart
+            is EntityHorse -> horse && matureAnimalCheck
+            is EntitySkeletonHorse -> skeletonHorse && matureAnimalCheck
+            is EntityDonkey -> donkey && matureAnimalCheck
+            is EntityMule -> mule && matureAnimalCheck
+            is EntityPig -> pig && entity.saddled && matureAnimalCheck
+            is EntityLlama -> llama && matureAnimalCheck
+            else -> false
+        }
     }
 }