diff --git a/typo3/sysext/backend/Classes/Template/Components/Buttons/Action/HelpButton.php b/typo3/sysext/backend/Classes/Template/Components/Buttons/Action/HelpButton.php
index b5f322e261b21b72d91c7ace0b66512863982434..0162a520800368429338b8d41d0799dbf7f7f49b 100644
--- a/typo3/sysext/backend/Classes/Template/Components/Buttons/Action/HelpButton.php
+++ b/typo3/sysext/backend/Classes/Template/Components/Buttons/Action/HelpButton.php
@@ -148,6 +148,9 @@ class HelpButton implements ButtonInterface, PositionInterface
     public function render()
     {
         $helpMarkup = BackendUtility::cshItem($this->moduleName, $this->fieldName);
+        if ($helpMarkup === '') {
+            return '';
+        }
         return '<span class="btn btn-sm btn-default">' . $helpMarkup . '</span>';
     }
 }
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 1eba835d72900e1bf8bd8278bdb8895317d9a9b2..7adeb9383b3621aaac254c4c31452576efc77067 100755
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -2847,11 +2847,10 @@ class BackendUtility
                     $wrappedText .= ' data-description="' . htmlspecialchars($overloadHelpText['description']) . '"';
                 }
             }
-        } else {
-            $wrappedText = '<span data-table="' . $table . '" data-field="' . $field . '"';
+            $wrappedText .= '>' . $text . '</span>';
+            return $wrappedText;
         }
-        $wrappedText .= '>' . $text . '</span>';
-        return $wrappedText;
+        return '';
     }
 
     /**