diff --git a/src/components/code/_code_block.tsx b/src/components/code/_code_block.tsx
index dd9d1a9ddb4..17793392d15 100644
--- a/src/components/code/_code_block.tsx
+++ b/src/components/code/_code_block.tsx
@@ -210,12 +210,12 @@ export const EuiCodeBlockImpl: FunctionComponent<Props> = ({
   const getCopyButton = (textToCopy?: string) => {
     let copyButton: JSX.Element | undefined;
 
-    if (isCopyable && textToCopy) {
+    if (isCopyable) {
       copyButton = (
         <div className="euiCodeBlock__copyButton">
           <EuiI18n token="euiCodeBlock.copyButton" default="Copy">
             {(copyButton: string) => (
-              <EuiCopy textToCopy={textToCopy}>
+              <EuiCopy textToCopy={textToCopy?textToCopy:""}>
                 {(copy) => (
                   <EuiButtonIcon
                     size="s"
diff --git a/src/components/inner_text/inner_text.tsx b/src/components/inner_text/inner_text.tsx
index 64760e2bede..db72fb5b77d 100644
--- a/src/components/inner_text/inner_text.tsx
+++ b/src/components/inner_text/inner_text.tsx
@@ -42,9 +42,12 @@ export function useInnerText(
         // while the result of `textContent` could correctly be non-`null` due to
         // differing reliance on browser layout calculations.
         // We prefer the result of `innerText`, if available.
-        'innerText' in node
-          ? node.innerText
-          : node.textContent || innerTextFallback
+
+        // 'innerText' in node
+        //   ? node.innerText
+        //   : node.textContent || innerTextFallback
+
+        node.textContent === null ? undefined: node.textContent
       );
     },
     [innerTextFallback]