diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index c59ec60a6..f9975bfc4 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -21,7 +21,7 @@ Meteor.startup(() => {
     // Create the synchronizer used to update reference lines
     OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('cornerstonenewimage', cornerstoneTools.updateImageSynchronizer);
 
-    OHIF.viewer.metadataProvider = OHIF.cornerstone.metadataProvider;
+    OHIF.viewer.metadataProvider = new OHIF.cornerstone.MetadataProvider();
 
     // Metadata configuration
     const metadataProvider = OHIF.viewer.metadataProvider;
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 800f3a7b8..96e525f68 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -69,7 +69,7 @@ Meteor.startup(() => {
     // Create the synchronizer used to update reference lines
     OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('cornerstonenewimage', cornerstoneTools.updateImageSynchronizer);
 
-    OHIF.viewer.metadataProvider = OHIF.cornerstone.metadataProvider;
+    OHIF.viewer.metadataProvider = new OHIF.cornerstone.MetadataProvider();
 
     // Metadata configuration
     const metadataProvider = OHIF.viewer.metadataProvider;
diff --git a/Packages/ohif-cornerstone-settings/imports/client/index.js b/Packages/ohif-cornerstone-settings/imports/client/index.js
index 1415fcaeb..477127899 100644
--- a/Packages/ohif-cornerstone-settings/imports/client/index.js
+++ b/Packages/ohif-cornerstone-settings/imports/client/index.js
@@ -3,4 +3,7 @@ import { OHIF } from 'meteor/ohif:core';
 import './renderer.js';
 
 import { MetadataProvider } from './lib/classes/MetadataProvider';
+OHIF.cornerstone.MetadataProvider = MetadataProvider;
+
+// TODO: Remove this after all viewers are updated to create an instance of OHIF.cornerstone.MetadataProvider
 OHIF.cornerstone.metadataProvider = new MetadataProvider();
diff --git a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
index e6b151f21..ab8f311a9 100644
--- a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
+++ b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
@@ -14,7 +14,7 @@ Template.standaloneViewerMain.onCreated(() => {
     // Create the synchronizer used to update reference lines
     OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('cornerstonenewimage', cornerstoneTools.updateImageSynchronizer);
 
-    OHIF.viewer.metadataProvider = OHIF.cornerstone.metadataProvider;
+    OHIF.viewer.metadataProvider = new OHIF.cornerstone.MetadataProvider();
     // Metadata configuration
     const metadataProvider = OHIF.viewer.metadataProvider;
     cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));