diff --git a/code/CMSMain.php b/code/CMSMain.php
index 443f1b67..8a3bc7a0 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -291,9 +291,13 @@ JS;
 			}
 
 			// Don't open a page from a different locale
-			if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
+			/** The record's Locale is saved in database in 2.4, and not related with Session, we should check their locale matches the Translatable::get_current_locale,
+			 * 	as long as we all the HTTPRequest is init with right locale.
+			 *	This bit breaks the all FileIFrameField functions if the field is used in CMS and its relevent ajax calles, like loading the tree dropdown for TreeSelectorField. 
+			 */
+			/* if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) {
 				$record = null;
-			}
+			}*/
 
 			return $record;