diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 81dc2f34b..b06ba26bf 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -600,13 +600,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			$content .= "  <li class=\"".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
 			$content .= '    <a';
-			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
+			$content .= !empty($menuitem['link']) ? ' href="'.$menuitem['link'].'"' : '';
 			if(!empty($menuitem['attributes']))
 				foreach($menuitem['attributes'] as $attr)
 					$content .= ' '.$attr[0].'="'.$attr[1].'"';
 			$content .= '>';
 			$content .= $menuitem['label'];
-			$content .= '<span class="badge badge-right">'.$menuitem['badge']."</span>";
+			if(!empty($menuitem['badge']))
+				$content .= '<span class="badge badge-right">'.$menuitem['badge']."</span>";
 			$content .= '    </a>'."\n";
 			$content .= "  </li>\n";
 		}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index aa31deaac..ac611ffef 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -605,14 +605,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			$content .= "  <li class=\"list-group-item d-flex justify-content-between align-items-center".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
 			$content .= '    <a';
-			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
+			$content .= !empty($menuitem['link']) ? ' href="'.$menuitem['link'].'"' : '';
 			if(!empty($menuitem['attributes']))
 				foreach($menuitem['attributes'] as $attr)
 					$content .= ' '.$attr[0].'="'.$attr[1].'"';
 			$content .= '>';
 			$content .= $menuitem['label'];
 			$content .= '    </a>'."\n";
-			$content .= '<span class="badge badge-primary badge-pill">'.$menuitem['badge']."</span>";
+			if(!empty($menuitem['badge']))
+				$content .= '<span class="badge badge-primary badge-pill">'.$menuitem['badge']."</span>";
 			$content .= "  </li>\n";
 		}