diff --git a/packages/rocketchat-lib/settings/server/publication.coffee b/packages/rocketchat-lib/settings/server/publication.coffee
index 0c5a2b9161e..3b2aa1c8dda 100644
--- a/packages/rocketchat-lib/settings/server/publication.coffee
+++ b/packages/rocketchat-lib/settings/server/publication.coffee
@@ -2,6 +2,7 @@ Meteor.publish 'settings', (ids = []) ->
 	console.log '[publish] settings'.green
 
 	filter =
+		hidden: { $ne: true }
 		public: true
 
 	if ids.length > 0
diff --git a/server/startup/settings.coffee b/server/startup/settings.coffee
index c7a0e66ccda..83132ad9a0e 100644
--- a/server/startup/settings.coffee
+++ b/server/startup/settings.coffee
@@ -1,4 +1,4 @@
 # Remove runtime settings (non-persistent)
 Meteor.startup ->
-	RocketChat.models.Settings.remove({ ts: { $lt: RocketChat.settings.ts } })
+	RocketChat.models.Settings.update({ ts: { $lt: RocketChat.settings.ts } }, { $set: { hidden: true } })