diff --git a/pkg/interface/src/views/components/RemoteContent.tsx b/pkg/interface/src/views/components/RemoteContent.tsx
index 68790ce29..28ed350b7 100644
--- a/pkg/interface/src/views/components/RemoteContent.tsx
+++ b/pkg/interface/src/views/components/RemoteContent.tsx
@@ -139,14 +139,14 @@ export default class RemoteContent extends PureComponent<RemoteContentProps, Rem
         </>
       );
     } else if (isOembed && remoteContentPolicy.oembedShown) {
-      if (!this.state.embed) {
+      if (!this.state.embed || this.state.embed?.html === '') {
         this.loadOembed();
       }
 
       return (
         <Fragment>
           {renderUrl ? this.wrapInLink(this.state.embed && this.state.embed.title ? this.state.embed.title : url) : null}
-          {this.state.embed !== 'error' && !unfold ? <Button
+          {this.state.embed !== 'error' && this.state.embed?.html && !unfold ? <Button
             border={1}
             style={{ display: 'inline-flex', height: '1.66em' }} // Height is hacked to line-height until Button supports proper size
             ml={1}