diff --git a/code/extensions/FileSubsites.php b/code/extensions/FileSubsites.php
index e0db45a..cdc480a 100644
--- a/code/extensions/FileSubsites.php
+++ b/code/extensions/FileSubsites.php
@@ -43,6 +43,8 @@ class FileSubsites extends DataExtension {
 	 * Update any requests to limit the results to the current site
 	 */
 	function augmentSQL(SQLQuery &$query) {
+		if(Subsite::$disable_subsite_filter) return;
+
 		// If you're querying by ID, ignore the sub-site - this is a bit ugly... (but it was WAYYYYYYYYY worse)
 		//@TODO I don't think excluding if SiteTree_ImageTracking is a good idea however because of the SS 3.0 api and ManyManyList::removeAll() changing the from table after this function is called there isn't much of a choice