1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
index a952bc85a..25d0669ed 100644
--- a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
@@ -171,9 +171,17 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
     @Override
     public void onChannelSearchResultsFound(List<MuclumbusService.Room> results) {
         runOnUiThread(() -> {
-            adapter.submitList(results);
-            binding.list.setVisibility(View.VISIBLE);
-            binding.progressBar.setVisibility(View.GONE);
+            if (results.size() > 0) {
+                adapter.submitList(results);
+                binding.list.setVisibility(View.VISIBLE);
+                binding.progressBar.setVisibility(View.GONE);
+                this.binding.noResults.setVisibility(View.GONE);
+            } else {
+                adapter.submitList(results);
+                binding.list.setVisibility(View.GONE);
+                binding.progressBar.setVisibility(View.GONE);
+                this.binding.noResults.setVisibility(View.VISIBLE);
+            }
         });
     }