diff --git a/src/asset_manager/config/config.js b/src/asset_manager/config/config.js
index 63afd77c7..ccc3d0010 100644
--- a/src/asset_manager/config/config.js
+++ b/src/asset_manager/config/config.js
@@ -73,6 +73,9 @@ module.exports = {
   // }
   uploadFile: '',
 
+  // In the absence of 'uploadFile' or 'upload' assets will be embedded as Base64
+  embedAsBase64: 1,
+
   // Handle the image url submit from the built-in 'Add image' form
   // @example
   // handleAdd: (textFromInput) => {
diff --git a/src/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js
index a4aac4d1d..f15cc195a 100644
--- a/src/asset_manager/view/FileUploader.js
+++ b/src/asset_manager/view/FileUploader.js
@@ -32,7 +32,7 @@ module.exports = Backbone.View.extend(
 
       if (uploadFile) {
         this.uploadFile = uploadFile.bind(this);
-      } else if (c.embedAsBase64) {
+      } else if (!c.upload && c.embedAsBase64) {
         this.uploadFile = this.constructor.embedAsBase64;
       }