diff --git a/es-core/src/components/BadgeComponent.cpp b/es-core/src/components/BadgeComponent.cpp
index 658ed9922..bde0fb284 100644
--- a/es-core/src/components/BadgeComponent.cpp
+++ b/es-core/src/components/BadgeComponent.cpp
@@ -183,7 +183,7 @@ const std::string BadgeComponent::getDisplayName(const std::string& shortName)
 
 void BadgeComponent::render(const glm::mat4& parentTrans)
 {
-    if (!isVisible() || mThemeOpacity == 0.0f)
+    if (!isVisible() || mFlexboxItems.empty() || mOpacity == 0.0f || mThemeOpacity == 0.0f)
         return;
 
     if (mOpacity * mThemeOpacity == 1.0f) {
diff --git a/es-core/src/components/FlexboxComponent.cpp b/es-core/src/components/FlexboxComponent.cpp
index c27657825..822bd55cf 100644
--- a/es-core/src/components/FlexboxComponent.cpp
+++ b/es-core/src/components/FlexboxComponent.cpp
@@ -34,7 +34,7 @@ FlexboxComponent::FlexboxComponent(std::vector<FlexboxItem>& items)
 
 void FlexboxComponent::render(const glm::mat4& parentTrans)
 {
-    if (!isVisible())
+    if (!isVisible() || mOpacity == 0.0f || mThemeOpacity == 0.0f)
         return;
 
     if (!mLayoutValid)