diff --git a/e2e/src/util.js b/e2e/src/util.js
index 7b536b72e0dcf7f0bdf3523269edd1afa455ca67..26d9e739bcb6e256ee0b97b30e2d6dd6230fa349 100644
--- a/e2e/src/util.js
+++ b/e2e/src/util.js
@@ -885,7 +885,10 @@ class WdIavPage extends WdLayoutPage{
       const els = await this._browser.findElements(
         By.css('div.loadingIndicator')
       )
-      return els.length === 0
+      const els2 = await this._browser.findElements(
+        By.css('.spinnerAnimationCircle')
+      )
+      return [...els, ...els2].length === 0
     }, 1e3 * 60 * 10)
   }
 
diff --git a/src/ui/nehubaContainer/nehubaContainer.template.html b/src/ui/nehubaContainer/nehubaContainer.template.html
index 68a7f3450573a675736c68383c78b2cf0e402794..6aee271815eb369c30ee9b753afaf8abc1355963 100644
--- a/src/ui/nehubaContainer/nehubaContainer.template.html
+++ b/src/ui/nehubaContainer/nehubaContainer.template.html
@@ -449,7 +449,7 @@
       [attr.id]="ID_MESH_LOADING_STATUS"
       role="status">
 
-      <div class="spinnerAnimationCircle">
+      <div [ngClass]="{spinnerAnimationCircle: !!(showPerpsectiveScreen$ | async)}">
       </div>
       <mat-list>
         <mat-list-item>