diff --git a/src/valueObjects/MediaProxy.js b/src/valueObjects/MediaProxy.js
index 04c56e6b..5a654edd 100644
--- a/src/valueObjects/MediaProxy.js
+++ b/src/valueObjects/MediaProxy.js
@@ -1,3 +1,5 @@
+import { resolvePath } from '../lib/pathHelper';
+
 let config;
 export const setConfig = (configObj) => {
   config = configObj;
@@ -8,15 +10,15 @@ export default function MediaProxy(value, file, uploaded = false) {
   this.file = file;
   this.uploaded = uploaded;
   this.sha = null;
-  this.path = config.media_folder && !uploaded ? config.media_folder + '/' + value : value;
-  this.public_path = config.public_folder && !uploaded ? config.public_folder + '/' + value : value;
+  this.path = config.media_folder && !uploaded ? `${ config.media_folder }/${ value }` : value;
+  this.public_path = !uploaded ? resolvePath(value, config.public_folder) : value;
 }
 
-MediaProxy.prototype.toString = function() {
+MediaProxy.prototype.toString = function () {
   return this.uploaded ? this.public_path : window.URL.createObjectURL(this.file, { oneTimeOnly: true });
 };
 
-MediaProxy.prototype.toBase64 = function() {
+MediaProxy.prototype.toBase64 = function () {
   return new Promise((resolve, reject) => {
     const fr = new FileReader();
     fr.onload = (readerEvt) => {