diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 5678304ffcf03bde0eaf945ed1bea90f0acba101..8855e0cdd704f7f0966b3ff3e0266b8d6bda717d 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -106,9 +106,9 @@ module NotificationsHelper
     end
   end
 
-  def notification_setting_icon(notification_setting)
+  def notification_setting_icon(notification_setting = nil)
     sprite_icon(
-      notification_setting.disabled? ? "notifications-off" : "notifications",
+      !notification_setting.present? || notification_setting.disabled? ? "notifications-off" : "notifications",
       css_class: "icon notifications-icon js-notifications-icon"
     )
   end
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index aea09bf8d4d32c9481be1dfe2c0f9719733b95c7..837707707a93d18422ba265bda0358904bd1d640 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -139,7 +139,9 @@
       - if signed_in
         - if issuable_sidebar[:project_emails_disabled]
           .block.js-emails-disabled
-            = notification_description(:owner_disabled)
+            .sidebar-collapsed-icon.has-tooltip{ title: notification_description(:owner_disabled), data: { placement: "left", container: "body", boundary: 'viewport' } }
+              = notification_setting_icon
+            .hide-collapsed= notification_description(:owner_disabled)
         - else
           .js-sidebar-subscriptions-entry-point
 
diff --git a/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml b/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml
new file mode 100644
index 0000000000000000000000000000000000000000..736e12ff69431d7a754bd9fe05b1ff7feabaa67d
--- /dev/null
+++ b/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml
@@ -0,0 +1,5 @@
+---
+title: Fix issuable sidebar icon on notification disabled
+merge_request: 32134
+author:
+type: fixed