diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
index d808f8f5e6..31502bea57 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
@@ -215,7 +215,9 @@ public class SelectFileBottomSheet extends BottomSheetBehaviourDialogFragment {
 
 	private void sortFileList() {
 		List<GPXInfo> gpxInfoList = gpxInfoMap.get(selectedFolder);
-		sortSelected(gpxInfoList);
+		if (gpxInfoList != null) {
+			sortSelected(gpxInfoList);
+		}
 		adapter.setGpxInfoList(gpxInfoList != null ? gpxInfoList : new ArrayList<GPXInfo>());
 	}