diff --git a/python/src/com/jetbrains/python/packaging/PyPIPackageUtil.java b/python/src/com/jetbrains/python/packaging/PyPIPackageUtil.java
index 402a2fdd9753..66a5a5384352 100644
--- a/python/src/com/jetbrains/python/packaging/PyPIPackageUtil.java
+++ b/python/src/com/jetbrains/python/packaging/PyPIPackageUtil.java
@@ -213,11 +213,13 @@ public class PyPIPackageUtil {
   }
 
   public void updatePyPICache(final PyPackageService service) throws IOException {
+    myPackageNames = null;
+    service.PY_PACKAGES.clear();
+    if (service.PYPI_REMOVED) return;
     parsePyPIList(getPyPIListFromWeb(), service);
   }
 
   public void parsePyPIList(final List<String> packages, final PyPackageService service) {
-    myPackageNames = null;
     for (String pyPackage : packages) {
       try {
         final Matcher matcher = PYPI_PATTERN.matcher(URLDecoder.decode(pyPackage, "UTF-8"));