diff --git a/bigbluebutton-html5/imports/api/annotations/server/modifiers/clearAnnotations.js b/bigbluebutton-html5/imports/api/annotations/server/modifiers/clearAnnotations.js
index 4207896f7c446717b73359ed0e852da48ae8bf04..f478df3f387921aae78a5d2b7173be1b312504fc 100644
--- a/bigbluebutton-html5/imports/api/annotations/server/modifiers/clearAnnotations.js
+++ b/bigbluebutton-html5/imports/api/annotations/server/modifiers/clearAnnotations.js
@@ -21,15 +21,18 @@ export default function clearAnnotations(meetingId, whiteboardId, userId) {
 
     if (numberAffected) {
       if (userId) {
-        return Logger.info(`Cleared Annotations for userId=${userId} where whiteboard=${whiteboardId}`);
+        Logger.info(`Cleared Annotations for userId=${userId} where whiteboard=${whiteboardId}`);]
+        return;
       }
 
       if (whiteboardId) {
-        return Logger.info(`Cleared Annotations for whiteboard=${whiteboardId}`);
+        Logger.info(`Cleared Annotations for whiteboard=${whiteboardId}`);
+        return
       }
 
       if (meetingId) {
-        return Logger.info(`Cleared Annotations (${meetingId})`);
+        Logger.info(`Cleared Annotations (${meetingId})`);
+        return
       }
 
       Logger.info('Cleared Annotations (all)');
diff --git a/bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js b/bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js
index 315ce25e254efa16253cc0a873eedb37d9efe99a..9ab4adf57c20842b51c2b45b780f0165b38c4b77 100644
--- a/bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js
+++ b/bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js
@@ -13,7 +13,10 @@ export default function createBreakoutRoom(rooms, durationInMinutes, record = fa
   const { meetingId, requesterUserId } = extractCredentials(this.userId);
 
   const eventName = 'CreateBreakoutRoomsCmdMsg';
-  if (rooms.length > MAX_BREAKOUT_ROOMS) return Logger.info(`Attempt to create breakout rooms with invalid number of rooms in meeting id=${meetingId}`);
+  if (rooms.length > MAX_BREAKOUT_ROOMS) {
+    Logger.info(`Attempt to create breakout rooms with invalid number of rooms in meeting id=${meetingId}`);
+    return;
+  }
   const payload = {
     record,
     durationInMinutes,
diff --git a/bigbluebutton-html5/imports/api/captions/server/methods/editCaptions.js b/bigbluebutton-html5/imports/api/captions/server/methods/editCaptions.js
index abc45f294d0b91dab0b973a9ace141bfb41756de..9cd569810209f992f924385c630d53327d62917c 100644
--- a/bigbluebutton-html5/imports/api/captions/server/methods/editCaptions.js
+++ b/bigbluebutton-html5/imports/api/captions/server/methods/editCaptions.js
@@ -16,7 +16,11 @@ export default function editCaptions(padId, data) {
 
   const pad = Captions.findOne({ padId });
 
-  if (!pad) return Logger.error(`Editing captions history: ${padId}`);
+  if (!pad) {
+    Logger.error(`Editing captions history: ${padId}`);
+    return;
+  }
+
 
   const {
     meetingId,
diff --git a/bigbluebutton-html5/imports/api/captions/server/methods/updateOwner.js b/bigbluebutton-html5/imports/api/captions/server/methods/updateOwner.js
index 3608ec308511463fd09d72813e2b33f3cd969175..58ecca6d7723164e333ae1c868ba7e8100639627 100644
--- a/bigbluebutton-html5/imports/api/captions/server/methods/updateOwner.js
+++ b/bigbluebutton-html5/imports/api/captions/server/methods/updateOwner.js
@@ -15,7 +15,10 @@ export default function editCaptions(meetingId, userId, padId) { // TODO
 
   const pad = Captions.findOne({ meetingId, padId });
 
-  if (!pad) return Logger.error(`Editing captions owner: ${padId}`);
+  if (!pad) {
+    Logger.error(`Editing captions owner: ${padId}`);
+    return;
+  }
 
   const { locale } = pad;
 
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
index e6049a70db444181661a46b3b8ce0be1019731af..8c99bfc02c000f5e44f63ace23036450f9004a9a 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
@@ -47,6 +47,7 @@ export default function meetingHasEnded(meetingId) {
     clearVideoStreams(meetingId);
     BannedUsers.delete(meetingId);
 
-    return Logger.info(`Cleared Meetings with id ${meetingId}`);
+    Logger.info(`Cleared Meetings with id ${meetingId}`);
+    return;
   });
 }
diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/setCurrentPresentation.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/setCurrentPresentation.js
index a741eb237487524435f03577be4d1d140d4594fd..04ed8b6200e88e75a94105fd080bd297970678c8 100644
--- a/bigbluebutton-html5/imports/api/presentations/server/modifiers/setCurrentPresentation.js
+++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/setCurrentPresentation.js
@@ -18,10 +18,12 @@ export default function setCurrentPresentation(meetingId, podId, presentationId)
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Unsetting the current presentation: ${err}`);
+        Logger.error(`Unsetting the current presentation: ${err}`);
+        return;
       }
 
-      return Logger.info('Unsetted as current presentation');
+      Logger.info('Unsetted as current presentation');
+      return;
     },
   };
 
@@ -36,10 +38,12 @@ export default function setCurrentPresentation(meetingId, podId, presentationId)
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Setting as current presentation id=${presentationId}: ${err}`);
+        Logger.error(`Setting as current presentation id=${presentationId}: ${err}`);
+        return;
       }
 
-      return Logger.info(`Setted as current presentation id=${presentationId}`);
+      Logger.info(`Setted as current presentation id=${presentationId}`);
+      return;
     },
   };
 
diff --git a/bigbluebutton-html5/imports/api/screenshare/server/modifiers/addScreenshare.js b/bigbluebutton-html5/imports/api/screenshare/server/modifiers/addScreenshare.js
index 18a6ed69a9419cd02df466ff6e95fdee80b36eb4..4ed513d7b454b4d3bd8931a21ccdc6a19f103766 100644
--- a/bigbluebutton-html5/imports/api/screenshare/server/modifiers/addScreenshare.js
+++ b/bigbluebutton-html5/imports/api/screenshare/server/modifiers/addScreenshare.js
@@ -24,6 +24,6 @@ export default function addScreenshare(meetingId, body) {
       Logger.info(`Upserted screenshare id=${body.screenshareConf}`);
     }
   } catch (err) {
-    return Logger.error(`Adding screenshare to collection: ${err}`);
+    Logger.error(`Adding screenshare to collection: ${err}`);
   }
 }
diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/changeCurrentSlide.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/changeCurrentSlide.js
index 2a73fc6cae5390dc94c1a39ff03f4aaa674f460c..9a4090147aa3f0d9ba4f7bd895a219e4fa288960 100755
--- a/bigbluebutton-html5/imports/api/slides/server/modifiers/changeCurrentSlide.js
+++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/changeCurrentSlide.js
@@ -20,10 +20,12 @@ export default function changeCurrentSlide(meetingId, podId, presentationId, sli
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Unsetting the current slide: ${err}`);
+        Logger.error(`Unsetting the current slide: ${err}`);
+        return;
       }
 
-      return Logger.info('Unsetted the current slide');
+      Logger.info('Unsetted the current slide');
+      return;
     },
   };
 
@@ -39,10 +41,12 @@ export default function changeCurrentSlide(meetingId, podId, presentationId, sli
     },
     callback: (err) => {
       if (err) {
-        return Logger.error(`Setting as current slide id=${slideId}: ${err}`);
+        Logger.error(`Setting as current slide id=${slideId}: ${err}`);
+        return;
       }
 
-      return Logger.info(`Setted as current slide id=${slideId}`);
+      Logger.info(`Setted as current slide id=${slideId}`);
+      return;
     },
   };
 
diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesPresentation.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesPresentation.js
index f23f907491ac79bebff4f08bd64dc1c5cfadd49c..a297d3401f45cbc84e9b2ec08073934f8ef71f23 100755
--- a/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesPresentation.js
+++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesPresentation.js
@@ -25,6 +25,7 @@ export default function clearSlidesPresentation(meetingId, presentationId) {
       Logger.info(`Removed Slides where presentationId=${presentationId}`);
     }
   } catch (err) {
-    return Logger.error(`Removing Slides from collection: ${err}`);
+    Logger.error(`Removing Slides from collection: ${err}`);
+    return;
   }
 }
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js b/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js
index 1a42716b59379dcc625267b76ef8dc4c50892000..33d8fc4af9a7a420d63289a543173da9bb5e3ea7 100755
--- a/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js
@@ -19,7 +19,8 @@ export default function userLeaving(meetingId, userId, connectionId) {
   const User = Users.findOne(selector);
 
   if (!User) {
-    return Logger.info(`Skipping userLeaving. Could not find ${userId} in ${meetingId}`);
+    Logger.info(`Skipping userLeaving. Could not find ${userId} in ${meetingId}`);
+    return;
   }
 
   // If the current user connection is not the same that triggered the leave we skip
diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
index 320e133cb8e71cc0a93758f8ca99963bcbb4ee8d..1ed52ca6cee9f517be13807f4a4709d60969d83e 100755
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
@@ -50,7 +50,8 @@ export default function removeUser(meetingId, userId) {
 
       clearUserInfoForRequester(meetingId, userId);
 
-      return Logger.info(`Removed user id=${userId} meeting=${meetingId}`);
+      Logger.info(`Removed user id=${userId} meeting=${meetingId}`);
+      return;
     }
   } catch (err) {
     Logger.error(`Removing user from collection: ${err}`);
diff --git a/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js b/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js
index e048f75ab381a8fe4415183a57b5998497b2ccc6..63fe8e284577b0af27085bed10ad1d2a35701270 100644
--- a/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js
+++ b/bigbluebutton-html5/imports/api/voice-users/server/modifiers/clearVoiceUsers.js
@@ -7,20 +7,20 @@ export default function clearVoiceUser(meetingId) {
       const numberAffected = VoiceUsers.remove({ meetingId });
 
       if (numberAffected) {
-        return Logger.info(`Cleared VoiceUsers in (${meetingId})`);
+        Logger.info(`Cleared VoiceUsers in (${meetingId})`);
       }
     } catch (err) {
-      return Logger.error(`Error on clearing VoiceUsers in ${meetingId}. ${err}`);
+      Logger.error(`Error on clearing VoiceUsers in ${meetingId}. ${err}`);
     }
-  }
-
-  try {
-    const numberAffected = VoiceUsers.remove({});
+  } else {
+    try {
+      const numberAffected = VoiceUsers.remove({});
 
-    if (numberAffected) {
-      return Logger.info('Cleared VoiceUsers in all meetings');
+      if (numberAffected) {
+        Logger.info('Cleared VoiceUsers in all meetings');
+      }
+    } catch (err) {
+      Logger.error(`Error on clearing VoiceUsers. ${err}`);
     }
-  } catch (err) {
-    return Logger.error(`Error on clearing VoiceUsers. ${err}`);
   }
 }