diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
index f39ada3eb..e93fbfc9a 100644
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -262,6 +262,7 @@ const AutorunResidentSource = new Lang.Class({
 
     _init: function() {
         this.parent(_("Removable Devices"), 'media-removable', St.IconType.FULLCOLOR);
+        this.showInLockScreen = false;
 
         this._mounts = [];
 
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index a231c9d92..a2729d3ee 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1037,6 +1037,7 @@ const Source = new Lang.Class({
         this.isTransient = false;
         this.isChat = false;
         this.isMuted = false;
+        this.showInLockScreen = true;
 
         this.notifications = [];
     },
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 74996da87..9d7237c8f 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -159,8 +159,9 @@ const NotificationsBox = new Lang.Class({
     },
 
     _summaryItemAdded: function(tray, item, dontUpdateVisibility) {
-        // Ignore transient sources
-        if (item.source.isTransient)
+        // Ignore transient sources, or sources explicitly marked not to show
+        // in the lock screen
+        if (item.source.isTransient || !item.source.showInLockScreen)
             return;
 
         let obj = {