diff --git a/Vector/ViewController/DirectoryViewController.m b/Vector/ViewController/DirectoryViewController.m
index 5ef0150b4..bf6d2947e 100644
--- a/Vector/ViewController/DirectoryViewController.m
+++ b/Vector/ViewController/DirectoryViewController.m
@@ -50,7 +50,12 @@
 {
     [super viewDidAppear:animated];
 
-    if (self.splitViewController && !self.splitViewController.isCollapsed)
+    // Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition)
+    if (self.splitViewController && self.splitViewController.isCollapsed)
+    {
+        [[AppDelegate theDelegate].homeViewController closeSelectedRoom];
+    }
+    else
     {
         // In case of split view controller where the primary and secondary view controllers are displayed side-by-side onscreen,
         // the selected room (if any) is highlighted.
diff --git a/Vector/ViewController/HomeViewController.m b/Vector/ViewController/HomeViewController.m
index 23a45f96e..22b136a9d 100644
--- a/Vector/ViewController/HomeViewController.m
+++ b/Vector/ViewController/HomeViewController.m
@@ -192,8 +192,7 @@
     [super viewDidAppear:animated];
 
     // Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition)
-    // Note: 'isCollapsed' property is available in UISplitViewController for iOS 8 and later.
-    if (!self.splitViewController || ([self.splitViewController respondsToSelector:@selector(isCollapsed)] && self.splitViewController.isCollapsed))
+    if (!self.splitViewController || self.splitViewController.isCollapsed)
     {
         // Release the current selected room (if any).
         [self closeSelectedRoom];
@@ -210,9 +209,8 @@
 {
     [super viewWillDisappear:animated];
 
-    // TODO: Check why it was done before
-    //_selectedRoomId = nil;
-    //_selectedRoomSession = nil;
+    _selectedRoomId = nil;
+    _selectedRoomSession = nil;
 }
 
 - (void) viewDidLayoutSubviews
diff --git a/Vector/ViewController/RecentsViewController.m b/Vector/ViewController/RecentsViewController.m
index d1693f85e..83b9c41fe 100644
--- a/Vector/ViewController/RecentsViewController.m
+++ b/Vector/ViewController/RecentsViewController.m
@@ -120,11 +120,10 @@
     [super viewDidAppear:animated];
     
     // Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition)
-    // Note: 'isCollapsed' property is available in UISplitViewController for iOS 8 and later.
-    if (!self.splitViewController || ([self.splitViewController respondsToSelector:@selector(isCollapsed)] && self.splitViewController.isCollapsed))
+    if (!self.splitViewController || self.splitViewController.isCollapsed)
     {
         // Release the current selected room (if any).
-        //[self closeSelectedRoom];
+        [homeViewController closeSelectedRoom];
     }
     else
     {