diff --git a/setup/src/Magento/Setup/Model/PackagesData.php b/setup/src/Magento/Setup/Model/PackagesData.php
index 4b0b8fc2f87b9e1cd4588860ad33071fb18af08a..1fc8e9db2bf64f3874bbfa457eb3384d91425863 100644
--- a/setup/src/Magento/Setup/Model/PackagesData.php
+++ b/setup/src/Magento/Setup/Model/PackagesData.php
@@ -491,12 +491,10 @@ class PackagesData
                 $packageVersions = array_reverse($packageVersions);
 
                 return array_keys($packageVersions);
-            } else {
-                return $this->getPackageAvailableVersionByComposerCommand($package);
             }
-        } else {
-            return $this->getPackageAvailableVersionByComposerCommand($package);
         }
+
+        return $this->getAvailableVersionsFromAllRepositories($package);
     }
 
     /**
@@ -506,7 +504,7 @@ class PackagesData
      * @return array
      * @exception \RuntimeException
      */
-    private function getPackageAvailableVersionByComposerCommand($package)
+    private function getAvailableVersionsFromAllRepositories($package)
     {
         $versionsPattern = '/^versions\s*\:\s(.+)$/m';