diff --git a/wax-prosemirror-services/src/ImageService/components/ImageUpload.js b/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
index 1be9b56fb9e52f6e482b59a273f67138785cedb9..26a59f7e94771b33f83c3cdcb38dfcfd719abec7 100644
--- a/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
+++ b/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
@@ -67,19 +67,13 @@ const ImageUpload = ({ item, fileUpload, view }) => {
   const isDisabled =
     context.options.uploading || !item.select(activeView) || !isEditable;
 
-  useEffect(() => {}, []);
-
   const ImageUploadComponent = useMemo(
     () => (
       <Wrapper>
         <label htmlFor="file-upload">
           <MenuButton
             active={false}
-            disabled={
-              context.options.uploading ||
-              !item.select(activeView) ||
-              !isEditable
-            }
+            disabled={isDisabled}
             iconName={item.icon}
             onMouseDown={e => {
               e.preventDefault();
diff --git a/wax-prosemirror-services/src/ImageService/fileUpload.js b/wax-prosemirror-services/src/ImageService/fileUpload.js
index 3275e45bd95c23408905aa7c24f8e147896c8bb4..901abff9172997b8ea6d1068b27e7517e8a749e8 100644
--- a/wax-prosemirror-services/src/ImageService/fileUpload.js
+++ b/wax-prosemirror-services/src/ImageService/fileUpload.js
@@ -38,6 +38,7 @@ export default (view, fileUpload, placeholderPlugin, context) => file => {
       }
       // Otherwise, insert it at the placeholder's position, and remove
       // the placeholder
+      context.setOption({ uploading: false });
       context.pmViews.main.dispatch(
         context.pmViews.main.state.tr
           .replaceWith(
@@ -51,7 +52,6 @@ export default (view, fileUpload, placeholderPlugin, context) => file => {
           )
           .setMeta(placeholderPlugin, { remove: { id } }),
       );
-      context.setOption({ uploading: false });
     },
     () => {
       // On failure, just clean up the placeholder