diff --git a/lib/browser/desktop-capturer.js b/lib/browser/desktop-capturer.js
index 74acb828544..48a7a2ad691 100644
--- a/lib/browser/desktop-capturer.js
+++ b/lib/browser/desktop-capturer.js
@@ -30,7 +30,6 @@ ipcMain.on(electronSources, (event, captureWindow, captureScreen, thumbnailSize,
   // reference from requestsQueue to make the module not send the result to it.
   event.sender.once('destroyed', () => {
     request.webContents = null
-    return
   })
 })
 
@@ -48,19 +47,15 @@ desktopCapturer.emit = (event, name, sources) => {
     }
   })
 
-  if (handledWebContents != null) {
+  if (handledWebContents) {
     handledWebContents.send(capturerResult(handledRequest.id), result)
   }
 
-  // Check the queue to see whether there is other same request. If has, handle
-  // it for reducing redunplicated `desktopCaptuer.startHandling` calls.
-
+  // Check the queue to see whether there is another identical request & handle
   requestsQueue.forEach(request => {
     const webContents = request.webContents
     if (deepEqual(handledRequest.options, request.options)) {
-      if (webContents != null) {
-        webContents.send(capturerResult(request.id), result)
-      }
+      if (webContents) webContents.send(capturerResult(request.id), result)
     } else {
       unhandledRequestsQueue.push(request)
     }
diff --git a/lib/renderer/api/desktop-capturer.js b/lib/renderer/api/desktop-capturer.js
index ff47dfd8e98..b9320c893fc 100644
--- a/lib/renderer/api/desktop-capturer.js
+++ b/lib/renderer/api/desktop-capturer.js
@@ -8,10 +8,10 @@ const incrementId = () => {
   return currentId
 }
 
-// |options.type| can not be empty and has to include 'window' or 'screen'.
+// |options.types| can't be empty and must be an array
 function isValid (options) {
-  const types = (options != null) ? options.types : undefined
-  return (types != null) && Array.isArray(options.types)
+  const types = options ? options.types : undefined
+  return Array.isArray(types)
 }
 
 exports.getSources = function (options, callback) {