diff --git a/bigbluebutton-html5/imports/api/annotations/server/handlers/whiteboardSend.js b/bigbluebutton-html5/imports/api/annotations/server/handlers/whiteboardSend.js
index bfa54f53d5d8e754efdba79541330b7ccc5a84df..3a69caa02d4cbc2ba1284bdc0254460d8d9ade9c 100755
--- a/bigbluebutton-html5/imports/api/annotations/server/handlers/whiteboardSend.js
+++ b/bigbluebutton-html5/imports/api/annotations/server/handlers/whiteboardSend.js
@@ -3,6 +3,8 @@ import AnnotationsStreamer from '/imports/api/annotations/server/streamer';
 import addAnnotation from '../modifiers/addAnnotation';
 import Metrics from '/imports/startup/server/metrics';
 
+const { queueMetrics } = Meteor.settings.private.redis.metrics;
+
 const ANNOTATION_PROCCESS_INTERVAL = 60;
 
 let annotationsQueue = {};
@@ -32,12 +34,14 @@ export default function handleWhiteboardSend({ header, body }, meetingId) {
   const whiteboardId = annotation.wbId;
   check(whiteboardId, String);
 
-  if(!annotationsQueue.hasOwnProperty(meetingId)) {
+  if (!annotationsQueue.hasOwnProperty(meetingId)) {
     annotationsQueue[meetingId] = [];
   }
 
   annotationsQueue[meetingId].push({ meetingId, whiteboardId, userId, annotation });
-  Metrics.setAnnotationQueueLength(meetingId, annotationsQueue[meetingId].length);
+  if (queueMetrics) {
+    Metrics.setAnnotationQueueLength(meetingId, annotationsQueue[meetingId].length);
+  }
   if (!annotationsRecieverIsRunning) proccess();
 
   return addAnnotation(meetingId, whiteboardId, userId, annotation);