diff --git a/setup/itopextension.class.inc.php b/setup/itopextension.class.inc.php
index e7c8af96d..858dd23f1 100644
--- a/setup/itopextension.class.inc.php
+++ b/setup/itopextension.class.inc.php
@@ -135,8 +135,9 @@ class iTopExtension
 			return $this->bCanBeUninstalled;
 		}
 		foreach ($this->aModuleInfo as $sModuleCode => $aModuleInfo) {
-			$this->bCanBeUninstalled = $aModuleInfo['uninstallable'] === 'yes';
-			return $this->bCanBeUninstalled;
+			if ($aModuleInfo['uninstallable'] !== 'yes') {
+				return false;
+			}
 		}
 		return true;
 	}