diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
index 153986c7..d76eea52 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
@@ -4,10 +4,12 @@ import android.annotation.SuppressLint
 import android.graphics.drawable.Animatable
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.SoundEffectConstants
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.LinearLayout
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import androidx.recyclerview.widget.RecyclerView
@@ -22,6 +24,7 @@ import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.views.buttons.BigButton
 
 @UnstableApi
 class ShortsFragment : MainFragment() {
@@ -47,6 +50,8 @@ class ShortsFragment : MainFragment() {
         get() = channelShortsPager != null
 
     private var viewPager: ViewPager2? = null
+    private lateinit var zeroState: LinearLayout
+    private lateinit var sourcesButton: BigButton
     private lateinit var overlayLoading: FrameLayout
     private lateinit var overlayLoadingSpinner: ImageView
     private lateinit var overlayQualityContainer: FrameLayout
@@ -108,10 +113,17 @@ class ShortsFragment : MainFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         viewPager = view.findViewById(R.id.view_pager)
+        zeroState = view.findViewById(R.id.zero_state)
+        sourcesButton = view.findViewById(R.id.sources_button)
         overlayLoading = view.findViewById(R.id.short_view_loading_overlay)
         overlayLoadingSpinner = view.findViewById(R.id.short_view_loader)
         overlayQualityContainer = view.findViewById(R.id.shorts_quality_overview)
 
+        sourcesButton.setOnClickListener {
+            sourcesButton.playSoundEffect(SoundEffectConstants.CLICK)
+            navigate<SourcesFragment>()
+        }
+
         setLoading(true)
 
         Logger.i(TAG, "Creating adapter")
@@ -140,9 +152,11 @@ class ShortsFragment : MainFragment() {
 
             loadPagerTask!!.success {
                 setLoading(false)
+                updateZeroState()
             }
         } else {
             setLoading(false)
+            updateZeroState()
         }
 
         viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
@@ -186,6 +200,14 @@ class ShortsFragment : MainFragment() {
         })
     }
 
+    private fun updateZeroState() {
+        if (mainShorts.isEmpty()) {
+            zeroState.visibility = View.VISIBLE
+        } else {
+            zeroState.visibility = View.GONE
+        }
+    }
+
     private fun nextPage() {
         nextPageTask?.cancel()
 
@@ -290,7 +312,7 @@ class ShortsFragment : MainFragment() {
         private val inflater: LayoutInflater,
         private val fragment: MainFragment,
         private val overlayQualityContainer: FrameLayout,
-        private val isChannelShortsMode:  () -> Boolean,
+        private val isChannelShortsMode: () -> Boolean,
         private val onNearEnd: () -> Unit,
     ) : RecyclerView.Adapter<CustomViewHolder>() {
         val onResetTriggered = Event0()
@@ -300,8 +322,7 @@ class ShortsFragment : MainFragment() {
 
         @OptIn(UnstableApi::class)
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomViewHolder {
-            val shortView =
-                ShortView(inflater, fragment, overlayQualityContainer)
+            val shortView = ShortView(inflater, fragment, overlayQualityContainer)
             shortView.onResetTriggered.subscribe {
                 onResetTriggered.emit()
             }
diff --git a/app/src/main/res/layout/fragment_shorts.xml b/app/src/main/res/layout/fragment_shorts.xml
index 25119232..0792f828 100644
--- a/app/src/main/res/layout/fragment_shorts.xml
+++ b/app/src/main/res/layout/fragment_shorts.xml
@@ -28,6 +28,62 @@
             app:srcCompat="@drawable/ic_loader_animated" />
     </FrameLayout>
 
+    <!-- zero state -->
+    <LinearLayout
+        android:id="@+id/zero_state"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginHorizontal="24dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginBottom="10dp"
+            android:importantForAccessibility="no"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_help" />
+
+        <TextView
+            android:id="@+id/text_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:fontFamily="@font/inter_bold"
+            android:gravity="center"
+            android:text="@string/no_results"
+            android:textColor="@color/white"
+            android:textSize="22dp" />
+
+        <TextView
+            android:id="@+id/text_centered"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="10dp"
+            android:fontFamily="@font/inter_regular"
+            android:gravity="center"
+            android:text="@string/no_results_shorts"
+            android:textColor="@color/gray_ac"
+            android:textSize="13dp" />
+
+        <com.futo.platformplayer.views.buttons.BigButton
+            android:id="@+id/sources_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:buttonIcon="@drawable/ic_creators"
+            app:buttonSubText="Go to the sources tab"
+            app:buttonText="Sources" />
+
+    </LinearLayout>
+
     <FrameLayout
         android:id="@+id/shorts_quality_overview"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ac75d7c..c1327051 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,6 +87,8 @@
     <string name="these_creators_not_in_group">These creators are not in this group.</string>
     <string name="disabled">Disabled</string>
     <string name="watch_later">Watch Later</string>
+    <string name="no_results">Nothing to see here</string>
+    <string name="no_results_shorts">The enabled sources do not have any short video results.</string>
     <string name="create">Create</string>
     <string name="ok">OK</string>
     <string name="yes">Yes</string>