diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
index de976563f..bccdee130 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
@@ -582,6 +582,7 @@ public class ChatRoomCreationFragment extends Fragment
                         mChatRoom.addListener(mChatRoomCreationListener);
                     } else {
                         Log.w("[Chat Room Creation Fragment] createChatRoom returned null...");
+                        mWaitLayout.setVisibility(View.GONE);
                     }
                 }
             } else {
@@ -608,6 +609,7 @@ public class ChatRoomCreationFragment extends Fragment
                             mChatRoom.addListener(mChatRoomCreationListener);
                         } else {
                             Log.w("[Chat Room Creation Fragment] createChatRoom returned null...");
+                            mWaitLayout.setVisibility(View.GONE);
                         }
                     } else {
                         LinphoneActivity.instance()
diff --git a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
index 305c74771..1e3f5f5ec 100644
--- a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
+++ b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
@@ -350,6 +350,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
                                 mTempChatRoom.addListener(mChatRoomCreationListener);
                             } else {
                                 Log.w("[Group Info Fragment] createChatRoom returned null...");
+                                mWaitLayout.setVisibility(View.GONE);
                             }
                         } else {
                             // Subject
diff --git a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
index 6d673eb3f..313719999 100644
--- a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
@@ -124,6 +124,7 @@ public class ContactDetailsFragment extends Fragment
                                     } else {
                                         Log.w(
                                                 "[Contact Details Fragment] createChatRoom returned null...");
+                                        mWaitLayout.setVisibility(View.GONE);
                                     }
                                 } else {
                                     room = lc.getChatRoom(participant);
diff --git a/app/src/main/java/org/linphone/history/HistoryDetailFragment.java b/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
index 391d0febd..a6272c603 100644
--- a/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
+++ b/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
@@ -246,6 +246,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
                         mChatRoom.addListener(mChatRoomCreationListener);
                     } else {
                         Log.w("[History Detail Fragment] createChatRoom returned null...");
+                        mWaitLayout.setVisibility(View.GONE);
                     }
                 } else {
                     room = lc.getChatRoom(participant);