diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index b10a9883e..7f262edb2 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -78,7 +78,16 @@ abstract class DBSearch
 	}
 	public function GetShowObsoleteData()
 	{
-		return $this->m_bShowObsoleteData;
+		if ($this->m_bArchiveMode || $this->IsAllDataAllowed())
+		{
+			// Enable obsolete data too!
+			$bRet = true;
+		}
+		else
+		{
+			$bRet = $this->m_bShowObsoleteData;
+		}
+		return $bRet;
 	}
 
 	public function NoContextParameters() {$this->m_bNoContextParameters = true;}