diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index b4e0168c266..075f694d6ba 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -17,6 +17,7 @@ Npm.depends({
 
 Package.onUse(function(api) {
 	api.use('rate-limit');
+	api.use('webapp');
 	api.use('session');
 	api.use('reactive-var');
 	api.use('reactive-dict');
diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index a78481da3ba..b254b748fd7 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -1,3 +1,4 @@
+/* global InstanceStatus */
 const logger = new Logger('Meteor', {
 	methods: {
 		method: {
@@ -36,3 +37,8 @@ Meteor.publish = function(name, func) {
 		return func.apply(this, arguments);
 	});
 };
+
+WebApp.rawConnectHandlers.use(function(req, res, next) {
+	res.setHeader('X-Instance-ID', InstanceStatus.id());
+	return next();
+});