diff --git a/app/modules/navigation-bar/dropdown-notifications/dropdown-notifications.jade b/app/modules/navigation-bar/dropdown-notifications/dropdown-notifications.jade
index ce314317..b105d522 100644
--- a/app/modules/navigation-bar/dropdown-notifications/dropdown-notifications.jade
+++ b/app/modules/navigation-bar/dropdown-notifications/dropdown-notifications.jade
@@ -6,7 +6,7 @@ a(
     ng-class="{'active': active}"
 )
     tg-svg(svg-icon="icon-bell")
-    div.counter(ng-if="total", ng-class="{'active': newEvent, 'large': total > 99, 'small': total < 10}") {{ total }}
+    div.counter(ng-if="total", ng-class="{'counter-active': newEvent, 'large': total > 99, 'small': total < 10}") {{ total }}
 div.navbar-dropdown-notifications(
     ng-show="visible",
     ng-mouseleave="visible=false"
diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss
index b31ad259..556db618 100644
--- a/app/modules/navigation-bar/navigation-bar.scss
+++ b/app/modules/navigation-bar/navigation-bar.scss
@@ -233,7 +233,7 @@ $dropdown-width: 350px;
             top: 2px;
             width: 22px;
         }
-        &.active {
+        &.counter-active {
             animation-duration: 2s;
             animation-name: highlightFadeOut;
         }
diff --git a/app/modules/notifications/notifications-list/notifications-list.jade b/app/modules/notifications/notifications-list/notifications-list.jade
index 046e4e0b..a99666dc 100644
--- a/app/modules/notifications/notifications-list/notifications-list.jade
+++ b/app/modules/notifications/notifications-list/notifications-list.jade
@@ -6,10 +6,10 @@ section.notifications-list
                 alt="Loading..."
             )
     div(ng-if="!vm.loading" )
-        .empty(ng-if="!vm.notificationsList.length")
+        .empty(ng-if="vm.notificationsList.size == 0 && !vm.onlyUnread")
             span {{ 'EVENTS.NO_EVENTS_YET' | translate }}
         div(
-            ng-if="vm.notificationsList.length"
+            ng-if="vm.notificationsList.size > 0"
             infinite-scroll="vm.loadNotifications()"
             infinite-scroll-disabled="vm.scrollDisabled"
             ng-attr-infinite-scroll-container="vm.infiniteScrollContainer"