diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsEntryPointActionProvider.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsEntryPointActionProvider.java
index 94bb86b5400e..afc1a5eb4898 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsEntryPointActionProvider.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsEntryPointActionProvider.java
@@ -58,6 +58,10 @@ final class UpdateSettingsEntryPointActionProvider implements ActionProvider {
   }
 
   private static void preparePrevPlatformUpdate() {
+    if (!UpdateSettings.getInstance().isCheckNeeded()) {
+      return;
+    }
+
     PropertiesComponent properties = PropertiesComponent.getInstance();
     BuildNumber newBuildForUpdate;
     try {
@@ -141,9 +145,15 @@ final class UpdateSettingsEntryPointActionProvider implements ActionProvider {
     if (settings.isCheckNeeded()) {
       setPlatformUpdateInfo(platformUpdateInfo);
     }
+    else {
+      setPlatformUpdateInfo(null);
+    }
     if (settings.isPluginsCheckNeeded()) {
       newPlatformUpdate(updatedPlugins, incompatiblePlugins, null);
     }
+    else {
+      newPlatformUpdate(null, null, (String)null);
+    }
     updateState();
   }
 
@@ -173,13 +183,18 @@ final class UpdateSettingsEntryPointActionProvider implements ActionProvider {
 
   public static void newPluginUpdates(@NotNull Collection<PluginDownloader> updatedPlugins,
                                       @NotNull Collection<PluginNode> customRepositoryPlugins) {
-    myUpdatedPlugins = updatedPlugins;
-    myCustomRepositoryPlugins = customRepositoryPlugins;
+    if (UpdateSettings.getInstance().isPluginsCheckNeeded()) {
+      myUpdatedPlugins = updatedPlugins;
+      myCustomRepositoryPlugins = customRepositoryPlugins;
+    }
+    else {
+      myUpdatedPlugins = null;
+    }
     updateState();
   }
 
   private static void newUpdatedPlugins(@Nullable Collection<PluginDownloader> updatedPlugins) {
-    myUpdatedPlugins = updatedPlugins == null || updatedPlugins.isEmpty() ? null : updatedPlugins;
+    myUpdatedPlugins = ContainerUtil.isEmpty(updatedPlugins) ? null : updatedPlugins;
     updateState();
   }