diff --git a/wax-prosemirror-services/src/ImageService/fileUpload.js b/wax-prosemirror-services/src/ImageService/fileUpload.js
index 901abff9172997b8ea6d1068b27e7517e8a749e8..67cf8ffabb393390961bab87bfdb22812276576b 100644
--- a/wax-prosemirror-services/src/ImageService/fileUpload.js
+++ b/wax-prosemirror-services/src/ImageService/fileUpload.js
@@ -30,7 +30,7 @@ export default (view, fileUpload, placeholderPlugin, context) => file => {
         extraData = fileData.extraData;
       }
 
-      const pos = findPlaceholder(view.state, id, placeholderPlugin);
+      let pos = findPlaceholder(view.state, id, placeholderPlugin);
       // If the content around the placeholder has been deleted, drop
       // the image
       if (pos == null) {
@@ -38,6 +38,12 @@ export default (view, fileUpload, placeholderPlugin, context) => file => {
       }
       // Otherwise, insert it at the placeholder's position, and remove
       // the placeholder
+
+      // if paragraph is empty don't break into new line
+      if (context.pmViews.main.state.doc.resolve(pos).parent.nodeSize === 2) {
+        pos -= 1;
+      }
+
       context.setOption({ uploading: false });
       context.pmViews.main.dispatch(
         context.pmViews.main.state.tr