diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
index dce10e1702a80..13ab903b179ae 100644
--- a/blocks/library/image/index.js
+++ b/blocks/library/image/index.js
@@ -4,6 +4,9 @@
import './style.scss';
import { registerBlock, query } from 'api';
import Editable from 'components/editable';
+// TODO: Revisit when we have a common components solution
+import Dashicon from '../../../editor/components/dashicon';
+import Button from '../../../editor/components/button';
const { attr, children } = query;
@@ -78,6 +81,23 @@ registerBlock( 'core/image', {
edit( { attributes, setAttributes, focus, setFocus } ) {
const { url, alt, caption } = attributes;
+ if ( ! url ) {
+ return (
+
+
+
+ { wp.i18n.__( 'Image' ) }
+
+
+ { wp.i18n.__( 'Drag image here or insert from media library' ) }
+
+
+
+ );
+ }
+
return (