diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10a8466..0864b2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.5
+Android: Fixes [#402](https://github.com/miguelpruivo/flutter_file_picker/issues/402).
+
 ## 2.0.4
 Desktop (Go): Fixes directory pick on Linux.
 
diff --git a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java
index 703e183..d7fb460 100644
--- a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java
+++ b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java
@@ -73,6 +73,10 @@ public class FilePickerDelegate implements PluginRegistry.ActivityResultListener
     @Override
     public boolean onActivityResult(final int requestCode, final int resultCode, final Intent data) {
 
+        if(type == null) {
+            return false;
+        }
+
         if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK) {
 
             if (eventSink != null) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 638310d..60948ca 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: file_picker
 description: A package that allows you to use a native file explorer to pick single or multiple absolute file paths, with extension filtering support.
 homepage: https://github.com/miguelpruivo/plugins_flutter_file_picker
-version: 2.0.4
+version: 2.0.5
 
 dependencies:
   flutter: