diff --git a/classes/Language.php b/classes/Language.php
index 3ce4b1908..6f0469774 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -466,7 +466,7 @@ class LanguageCore extends ObjectModel
 
 	public function delete()
 	{
-		if (!$this->hasMultishopEntries())
+		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
 		{
 			if (empty($this->iso_code))
 				$this->iso_code = Language::getIsoById($this->id);
@@ -514,7 +514,7 @@ class LanguageCore extends ObjectModel
 		
 		if (!parent::delete())
 			return false;
-		if (!$this->hasMultishopEntries())
+		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
 		{
 			// delete images
 			$files_copy = array(
@@ -831,4 +831,4 @@ class LanguageCore extends ObjectModel
 	{
 		return (Language::countActiveLanguages() > 1);
 	}
-}
+}
\ No newline at end of file