diff --git a/src/main/java/com/jfrog/ide/idea/scan/ScanManager.java b/src/main/java/com/jfrog/ide/idea/scan/ScanManager.java
index a78ba4c0..c95b670f 100644
--- a/src/main/java/com/jfrog/ide/idea/scan/ScanManager.java
+++ b/src/main/java/com/jfrog/ide/idea/scan/ScanManager.java
@@ -103,13 +103,13 @@ public void startScan() {
                 // Cache tree only if no errors occurred during scan.
                 if (scanners.values().stream().anyMatch(ScannerBase::isScanErrorOccurred)) {
                     componentsTree.deleteCachedTree();
+                    componentsTree.setScanErrorEmptyText();
                 } else if (scanners.values().stream().anyMatch(ScannerBase::isScanCanceled)) {
                     project.getMessageBus().syncPublisher(ApplicationEvents.ON_SCAN_LOCAL_CANCELED).update();
                 } else {
                     componentsTree.cacheTree();
-                    componentsTree.setScanErrorEmptyText();
+                    componentsTree.setNoIssuesEmptyText();
                 }
-                componentsTree.setNoIssuesEmptyText();
             } catch (JFrogInactiveEnvironmentException e) {
                 handleJfrogInactiveEnvironment(e.getRedirectUrl());
                 componentsTree.setScanErrorEmptyText();