diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h
index e14555e4b..5c6ad3c66 100644
--- a/es-core/src/components/primary/CarouselComponent.h
+++ b/es-core/src/components/primary/CarouselComponent.h
@@ -474,6 +474,9 @@ void CarouselComponent<T>::updateEntry(Entry& entry, const std::shared_ptr<Theme
 template <typename T> void CarouselComponent<T>::onDemandTextureLoad()
 {
     if constexpr (std::is_same_v<T, FileData*>) {
+        if (size() == 0)
+            return;
+
         if (mImageTypes.empty())
             mImageTypes.emplace_back("marquee");
 
@@ -1981,7 +1984,7 @@ template <typename T> void CarouselComponent<T>::onCursorChanged(const CursorSta
 
     GuiComponent::setAnimation(anim, 0, nullptr, false, 0);
 
-    if (mCursorChangedCallback && !mEntries.empty())
+    if (mCursorChangedCallback)
         mCursorChangedCallback(state);
 }
 
diff --git a/es-core/src/components/primary/GridComponent.h b/es-core/src/components/primary/GridComponent.h
index ae4de03a7..562cff02d 100644
--- a/es-core/src/components/primary/GridComponent.h
+++ b/es-core/src/components/primary/GridComponent.h
@@ -410,6 +410,9 @@ void GridComponent<T>::updateEntry(Entry& entry, const std::shared_ptr<ThemeData
 template <typename T> void GridComponent<T>::onDemandTextureLoad()
 {
     if constexpr (std::is_same_v<T, FileData*>) {
+        if (size() == 0)
+            return;
+
         if (mImageTypes.empty())
             mImageTypes.emplace_back("marquee");