diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
index ce7c1c5a747..65fb87062b6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
@@ -133,16 +133,21 @@ class KotlinPluginUpdater(val propertiesComponent: PropertiesComponent) : Dispos
 
     private fun updateCheck(callback: (PluginUpdateStatus) -> Boolean) {
         var updateStatus: PluginUpdateStatus
-        try {
-            updateStatus = checkUpdatesInMainRepository()
-
-            for (host in RepositoryHelper.getPluginHosts().filterNotNull()) {
-                val customUpdateStatus = checkUpdatesInCustomRepository(host)
-                updateStatus = updateStatus.mergeWith(customUpdateStatus)
-            }
+        if (KotlinPluginUtil.isSnapshotVersion()) {
+            updateStatus = PluginUpdateStatus.LatestVersionInstalled
         }
-        catch(e: Exception) {
-            updateStatus = PluginUpdateStatus.fromException("Kotlin plugin update check failed", e)
+        else {
+            try {
+                updateStatus = checkUpdatesInMainRepository()
+
+                for (host in RepositoryHelper.getPluginHosts().filterNotNull()) {
+                    val customUpdateStatus = checkUpdatesInCustomRepository(host)
+                    updateStatus = updateStatus.mergeWith(customUpdateStatus)
+                }
+            }
+            catch(e: Exception) {
+                updateStatus = PluginUpdateStatus.fromException("Kotlin plugin update check failed", e)
+            }
         }
 
         lastUpdateStatus = updateStatus
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
index 0f17c5b8ee9..ef46f20854f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
@@ -37,6 +37,10 @@ public class KotlinPluginUtil {
         return plugin.getVersion();
     }
 
+    public static boolean isSnapshotVersion() {
+        return "@snapshot@".equals(getPluginVersion());
+    }
+
     public static boolean isAndroidGradleModule(@NotNull Module module) {
         return KotlinModuleTypeManager.getInstance().isAndroidGradleModule(module);
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt b/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt
index 7a1b8da8c99..64152f545a5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt
@@ -37,7 +37,7 @@ data class VersionedLibrary(val library: Library, val version: String?, val used
 
 fun findOutdatedKotlinLibraries(project: Project): List<VersionedLibrary> {
     val pluginVersion = KotlinPluginUtil.getPluginVersion()
-    if ("@snapshot@" == pluginVersion) return emptyList() // plugin is run from sources, can't compare versions
+    if (KotlinPluginUtil.isSnapshotVersion()) return emptyList() // plugin is run from sources, can't compare versions
 
     // user already clicked suppress
     if (pluginVersion == PropertiesComponent.getInstance(project).getValue(SUPPRESSED_PROPERTY_NAME)) {