diff --git a/external/dist/webpack.js b/external/dist/webpack.js
index af3979439..90c872e26 100644
--- a/external/dist/webpack.js
+++ b/external/dist/webpack.js
@@ -18,7 +18,7 @@ var pdfjs = require('./build/pdf.js');
 var PdfjsWorker = require('worker-loader!./build/pdf.worker.js');
 
 if (typeof window !== 'undefined' && 'Worker' in window) {
-  pdfjs.PDFJS.workerPort = new PdfjsWorker();
+  pdfjs.GlobalWorkerOptions.workerPort = new PdfjsWorker();
 }
 
 module.exports = pdfjs;
diff --git a/src/display/api.js b/src/display/api.js
index e73515d6b..c91b21384 100644
--- a/src/display/api.js
+++ b/src/display/api.js
@@ -27,6 +27,7 @@ import {
 import { FontFaceObject, FontLoader } from './font_loader';
 import { CanvasGraphics } from './canvas';
 import globalScope from '../shared/global_scope';
+import { GlobalWorkerOptions } from './worker_options';
 import { Metadata } from './metadata';
 import { PDFDataTransportStream } from './transport_stream';
 import { WebGLContext } from './webgl';
@@ -240,8 +241,8 @@ function getDocument(src) {
 
   if (!worker) {
     // Worker was not provided -- creating and owning our own. If message port
-    // is specified in global settings, using it.
-    var workerPort = getDefaultSetting('workerPort');
+    // is specified in global worker options, using it.
+    let workerPort = GlobalWorkerOptions.workerPort;
     worker = workerPort ? PDFWorker.fromPort(workerPort) : new PDFWorker();
     task._worker = worker;
   }
diff --git a/src/display/dom_utils.js b/src/display/dom_utils.js
index f5e130d26..8bf31dfff 100644
--- a/src/display/dom_utils.js
+++ b/src/display/dom_utils.js
@@ -351,8 +351,6 @@ function getDefaultSetting(id) {
       return globalSettings ? globalSettings.cMapPacked : false;
     case 'postMessageTransfers':
       return globalSettings ? globalSettings.postMessageTransfers : true;
-    case 'workerPort':
-      return globalSettings ? globalSettings.workerPort : null;
     case 'workerSrc':
       return globalSettings ? globalSettings.workerSrc : null;
     case 'maxImageSize':
diff --git a/src/display/global.js b/src/display/global.js
index d37295d2d..de3d0f0fe 100644
--- a/src/display/global.js
+++ b/src/display/global.js
@@ -122,11 +122,6 @@ PDFJS.disableFontFace = (PDFJS.disableFontFace === undefined ?
  */
 PDFJS.workerSrc = (PDFJS.workerSrc === undefined ? null : PDFJS.workerSrc);
 
-/**
- * Defines global port for worker process. Overrides `workerSrc` setting.
- */
-PDFJS.workerPort = (PDFJS.workerPort === undefined ? null : PDFJS.workerPort);
-
 /**
  * Disable range request loading of PDF files. When enabled and if the server
  * supports partial content requests then the PDF will be fetched in chunks.