diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
index 58f0553f1..b827f8e8e 100644
--- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
@@ -652,6 +652,13 @@ class AllChatsViewController: HomeViewController {
         self.emptyView?.fill(with: emptyViewArtwork,
                              title: title,
                              informationText: informationText)
+        
+        // BWI: #5307
+        if let floatingButton = floatingButton, let emptyView = self.emptyView {
+            if emptyView.superview != nil {
+                view.insertSubview(floatingButton, aboveSubview: self.emptyView)
+            }
+        }
     }
     
     private var emptyViewArtwork: UIImage {