diff --git a/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js b/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js
index 9f0a228a5..c5c037658 100644
--- a/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js
+++ b/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js
@@ -433,8 +433,8 @@ async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
             contrastBolusAgent: DICOMWeb.getString(instance['00180010']),
             radiopharmaceuticalInfo: getRadiopharmaceuticalInfo(instance),
             baseWadoRsUri: baseWadoRsUri,
-            wadouri: wadouri,
-            wadorsuri: wadorsuri,
+            wadouri: WADOProxy.convertURL(wadouri, server),
+            wadorsuri: WADOProxy.convertURL(wadorsuri, server),
             imageRendering: server.imageRendering,
             thumbnailRendering: server.thumbnailRendering
         };
diff --git a/Packages/ohif-wadoproxy/both/convertURL.js b/Packages/ohif-wadoproxy/both/convertURL.js
index 781ba1d42..50e105da1 100644
--- a/Packages/ohif-wadoproxy/both/convertURL.js
+++ b/Packages/ohif-wadoproxy/both/convertURL.js
@@ -11,6 +11,10 @@ WADOProxy.convertURL = (url, serverConfiguration) => {
     }
 
     const { settings } = WADOProxy;
+    if (!settings.enabled) {
+        return url;
+    }
+
     const serverId = serverConfiguration._id;
     const query = queryString.stringify({url, serverId});
 
diff --git a/config/dcm4cheeDICOMWeb.json b/config/dcm4cheeDICOMWeb.json
index 70cfdf39c..43b8ecb27 100644
--- a/config/dcm4cheeDICOMWeb.json
+++ b/config/dcm4cheeDICOMWeb.json
@@ -50,5 +50,8 @@
         "studyListFunctionsEnabled": true,
         "studyListDateFilterNumDays": 1
     }
+  },
+  "proxy": {
+    "enabled": true
   }
 }
diff --git a/config/publicOrthancDICOMWeb.json b/config/publicOrthancDICOMWeb.json
index 8b78e604e..50faf31ab 100644
--- a/config/publicOrthancDICOMWeb.json
+++ b/config/publicOrthancDICOMWeb.json
@@ -30,5 +30,8 @@
         }
       ]
     }
+  },
+  "proxy": {
+    "enabled": true
   }
 }