diff --git a/Source/Game/Entities/Player/Player.Map.cs b/Source/Game/Entities/Player/Player.Map.cs
index 9dc365fc8..a5db581fb 100644
--- a/Source/Game/Entities/Player/Player.Map.cs
+++ b/Source/Game/Entities/Player/Player.Map.cs
@@ -539,7 +539,7 @@ namespace Game.Entities
                 return true;
 
             // raid instances require the player to be in a raid group to be valid
-            if (map.IsRaid() && !WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid))
+            if (map.IsRaid() && !WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid) && (map.GetEntry().Expansion() >= (Expansion)WorldConfig.GetIntValue(WorldCfg.Expansion)))
                 if (!GetGroup() || !GetGroup().isRaidGroup())
                     return false;
 
diff --git a/Source/Game/Handlers/MovementHandler.cs b/Source/Game/Handlers/MovementHandler.cs
index da0cb1acd..bd5ca76b5 100644
--- a/Source/Game/Handlers/MovementHandler.cs
+++ b/Source/Game/Handlers/MovementHandler.cs
@@ -350,7 +350,7 @@ namespace Game
             if (mInstance != null)
             {
                 // check if this instance has a reset time and send it to player if so
-                Difficulty diff = GetPlayer().GetDifficultyID(mapEntry);
+                Difficulty diff = newMap.GetDifficultyID();
                 MapDifficultyRecord mapDiff = Global.DB2Mgr.GetMapDifficultyData(mapEntry.Id, diff);
                 if (mapDiff != null)
                 {