diff --git a/src/app/cdk/alert-message/alert-message.component.scss b/src/app/cdk/alert-message/alert-message.component.scss
index f81779ca1..24020b871 100644
--- a/src/app/cdk/alert-message/alert-message.component.scss
+++ b/src/app/cdk/alert-message/alert-message.component.scss
@@ -11,14 +11,13 @@
 }
 
 .content {
-  ::ng-deep {
-    > :first-child {
-      margin-top: 8px;
-    }
-  }
   line-height: 21px !important;
 }
 
+.title:not(:empty) + .content:not(:empty) {
+  margin-top: 8px;
+}
+
 .alert-container {
   border: solid 2px;
   border-radius: 4px;
diff --git a/src/app/developer-tools/pages/developer-tools/developer-tools.component.html b/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
index 4dfdff223..21c56b9de 100644
--- a/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
+++ b/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
@@ -490,7 +490,10 @@ <h3 class="orc-font-body" i18n="@@developerTools.exampleCode">
         </ng-container>
       </ng-container>
 
-      <app-terms-of-use (developerToolsEnable)="ngOnInit()"></app-terms-of-use>
+      <app-terms-of-use
+        *ngIf="!developerToolsEnable && !this.loadingUserDevTolsState"
+        (developerToolsEnable)="ngOnInit()"
+      ></app-terms-of-use>
     </main>
   </div>
 </div>