diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 328d939ee..bfb552e73 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -952,12 +952,16 @@ public class ChatMessagesFragment extends Fragment
     /** File transfer related */
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        String files[] = new String[mFilesUploadLayout.getChildCount()];
-        for (int i = 0; i < mFilesUploadLayout.getChildCount(); i++) {
-            View child = mFilesUploadLayout.getChildAt(i);
-            String path = (String) child.getTag();
-            files[i] = path;
+        if (mFilesUploadLayout != null) {
+            String files[] = new String[mFilesUploadLayout.getChildCount()];
+            for (int i = 0; i < mFilesUploadLayout.getChildCount(); i++) {
+                View child = mFilesUploadLayout.getChildAt(i);
+                String path = (String) child.getTag();
+                files[i] = path;
+            }
+            outState.putStringArray("Files", files);
         }
+
         if (mCurrentInputContentInfo != null) {
             outState.putParcelable(
                     INPUT_CONTENT_INFO_KEY, (Parcelable) mCurrentInputContentInfo.unwrap());
@@ -965,7 +969,6 @@ public class ChatMessagesFragment extends Fragment
         }
         mCurrentInputContentInfo = null;
         mCurrentFlags = 0;
-        outState.putStringArray("Files", files);
         super.onSaveInstanceState(outState);
     }