diff --git a/Source/Game/DataStorage/ConversationDataStorage.cs b/Source/Game/DataStorage/ConversationDataStorage.cs
index a16aa09c6..6987d42fc 100644
--- a/Source/Game/DataStorage/ConversationDataStorage.cs
+++ b/Source/Game/DataStorage/ConversationDataStorage.cs
@@ -127,7 +127,7 @@ namespace Game.DataStorage
                     conversationTemplate.TextureKitId = templateResult.Read<uint>(2);
                     conversationTemplate.ScriptId = Global.ObjectMgr.GetScriptId(templateResult.Read<string>(3));
 
-                    conversationTemplate.Actors = actorsByConversation.TryGetValue(conversationTemplate.Id, out var actors) ? actors.ToList() : null;
+                    conversationTemplate.Actors = actorsByConversation.TryGetValue(conversationTemplate.Id, out var actors) ? actors.ToList() : new();
 
                     uint correctedFirstLineId = getFirstLineIdFromAnyLineId(conversationTemplate.FirstLineId);
                     if (conversationTemplate.FirstLineId != correctedFirstLineId)
diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 022e8200b..bcbddb525 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -692,9 +692,6 @@ namespace Game.Entities
             DuelComplete(DuelCompleteType.Interrupted);
 
             base.CleanupsBeforeDelete(finalCleanup);
-
-            if (GetTransport() != null)
-                GetTransport().RemovePassenger(this);
         }
 
         public override void AddToWorld()
diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs
index 6dab68648..23469dc68 100644
--- a/Source/Game/Handlers/CharacterHandler.cs
+++ b/Source/Game/Handlers/CharacterHandler.cs
@@ -616,6 +616,7 @@ namespace Game
                         else
                             SendCharCreate(ResponseCodes.CharCreateError);
 
+                        newChar.CleanupsBeforeDelete();
                         newChar.Dispose();
                     });
                 }