diff --git a/app/models/user.rb b/app/models/user.rb
index fbaf4627d..aa842c56a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -488,7 +488,8 @@ class User < ApplicationRecord
 
   # This method must be overwriten for addons that will be installed
   def show_login_system_notification?
-    user_system_notifications.show_on_login.present?
+    user_system_notifications.show_on_login.present? &&
+      (ENV['ENABLE_TUTORIAL'] != 'true' || settings['tutorial_completed'])
   end
 
   # json friendly attributes