diff --git a/demo/index.html b/demo/index.html
index d289be19a..1e4a81e01 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -51,7 +51,7 @@ <h3>Keyboard shortcuts:</h3>
 
       <p>Enjoy focusing on your content and not worrying about formatting!</p>
     </article>
-    
+
     <div class="demo-buttons">
       <a id="settings-btn"><i class="icon-settings"></i></a>
     </div>
@@ -77,6 +77,5 @@ <h3>Keyboard shortcuts:</h3>
 
   <!-- JS just for the demo page -->
   <script src="demo.js"></script>
-  
 </body>
 </html>
diff --git a/src/js/content-kit-editor/editor/editor.js b/src/js/content-kit-editor/editor/editor.js
index 73f64f2b5..9f288a525 100644
--- a/src/js/content-kit-editor/editor/editor.js
+++ b/src/js/content-kit-editor/editor/editor.js
@@ -26,6 +26,7 @@ var defaults = {
   spellcheck: true,
   autofocus: true,
   model: null,
+  serverHost: '',
   stickyToolbar: !!('ontouchstart' in window),
   textFormatCommands: [
     new BoldCommand(),
@@ -165,6 +166,12 @@ function Editor(element, options) {
   var editor = this;
   mergeWithOptions(editor, defaults, options);
 
+  // Update embed commands by prepending the serverHost
+  editor.embedCommands = [
+    new ImageCommand({  serviceUrl: editor.serverHost + '/upload' }),
+    new OEmbedCommand({ serviceUrl: editor.serverHost + '/embed'  })
+  ];
+
   if (element) {
     applyClassName(element);
     applyPlaceholder(element, editor.placeholder);
@@ -186,7 +193,7 @@ function Editor(element, options) {
 
     editor.textFormatToolbar = new TextFormatToolbar({ rootElement: element, commands: editor.textFormatCommands, sticky: editor.stickyToolbar });
     editor.linkTooltips = new Tooltip({ rootElement: element, showForTag: Type.LINK.tag });
-    
+
     if(editor.autofocus) { element.focus(); }
   }
 }