diff --git a/Data/scripts/commands/ChocoboRideCommand.lua b/Data/scripts/commands/ChocoboRideCommand.lua
index 8163f408..59bb989d 100644
--- a/Data/scripts/commands/ChocoboRideCommand.lua
+++ b/Data/scripts/commands/ChocoboRideCommand.lua
@@ -29,10 +29,14 @@ function onEventStarted(player, actor, triggerName, isGoobbue)
 		
 		worldMaster = GetWorldMaster();
 		
-		if (player:GetMountState() == 1) then
-			player:SendGameMessage(player, worldMaster, 26003, 0x20);
+		if (player.rentalExpireTime != 0) then
+			player:SendGameMessage(player, worldMaster, 26004, 0x20); --You dismount.
 		else
-			player:SendGameMessage(player, worldMaster, 26021, 0x20);		
+			if (player:GetMountState() == 1) then
+				player:SendGameMessage(player, worldMaster, 26003, 0x20); --You dismount X.
+			else
+				player:SendGameMessage(player, worldMaster, 26021, 0x20); --You dismount your Gobbue.
+			end
 		end
 		
 		player:SetMountState(0);
diff --git a/data/scripts/commands/ChocoboRideCommand.lua b/data/scripts/commands/ChocoboRideCommand.lua
deleted file mode 100644
index 8163f408..00000000
--- a/data/scripts/commands/ChocoboRideCommand.lua
+++ /dev/null
@@ -1,45 +0,0 @@
---[[
-
-ChocoboRideCommand Script
-
-Handles mounting and dismounting the Chocobo and Goobbue
-
---]]
-
-function onEventStarted(player, actor, triggerName, isGoobbue)
-
-	if (player:GetState() == 0) then		
-				
-		worldMaster = GetWorldMaster();		
-		
-		if (isGoobbue ~= true) then
-			player:ChangeMusic(83);
-			player:SendGameMessage(player, worldMaster, 26001, 0x20);
-			player:SetMountState(1);
-		else
-			player:ChangeMusic(98);
-			player:SendGameMessage(player, worldMaster, 26019, 0x20);
-			player:SetMountState(2);
-		end
-		
-		player:ChangeSpeed(0.0, 5.0, 10.0, 10.0);
-		player:ChangeState(15);
-	else
-		player:ChangeMusic(player:GetZone().bgmDay);
-		
-		worldMaster = GetWorldMaster();
-		
-		if (player:GetMountState() == 1) then
-			player:SendGameMessage(player, worldMaster, 26003, 0x20);
-		else
-			player:SendGameMessage(player, worldMaster, 26021, 0x20);		
-		end
-		
-		player:SetMountState(0);
-		player:ChangeSpeed(0.0, 2.0, 5.0, 5.0)
-		player:ChangeState(0); 
-	end
-	
-	player:EndEvent();
-	
-end
\ No newline at end of file