diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index bfb552e73..c8518d79c 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -974,7 +974,7 @@ public class ChatMessagesFragment extends Fragment
 
     private void onRestoreInstanceState(Bundle savedInstanceState) {
         String files[] = savedInstanceState.getStringArray("Files");
-        if (files.length > 0) {
+        if (files != null && files.length > 0) {
             for (String file : files) {
                 if (FileUtils.isExtensionImage(file)) {
                     addImageToPendingList(file);