diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java b/android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
index f710b2e0ae..d66f00cd53 100644
--- a/android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
+++ b/android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
@@ -19,6 +19,7 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.bookmarks.data.BookmarkCategory;
 import app.organicmaps.bookmarks.data.BookmarkManager;
+import app.organicmaps.util.Utils;
 
 import java.util.Objects;
 
@@ -42,10 +43,10 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
   public void onCreate(@Nullable Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-    Bundle args = getArguments();
+    final Bundle args = getArguments();
     if (args == null)
-      throw new IllegalArgumentException("Args must be not null");
-    mCategory = Objects.requireNonNull(args.getParcelable(BookmarkCategorySettingsActivity.EXTRA_BOOKMARK_CATEGORY));
+      throw new IllegalArgumentException("Args must not be null");
+    mCategory = Objects.requireNonNull(Utils.getParcelable(args, BookmarkCategorySettingsActivity.EXTRA_BOOKMARK_CATEGORY, BookmarkCategory.class));
   }
 
   @Nullable
diff --git a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
index 5403fa9121..158bf9f642 100644
--- a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -42,6 +42,7 @@ import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
 import app.organicmaps.util.CrashlyticsUtils;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 
@@ -112,7 +113,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     Bundle args = getArguments();
     BookmarkCategory category;
     if (args == null || (args.getBundle(EXTRA_BUNDLE) == null) ||
-        ((category = args.getBundle(EXTRA_BUNDLE).getParcelable(EXTRA_CATEGORY))) == null)
+        ((category = Utils.getParcelable(args.getBundle(EXTRA_BUNDLE), EXTRA_CATEGORY, BookmarkCategory.class))) == null)
       throw new IllegalArgumentException("Category not exist in bundle");
 
     return category;
diff --git a/android/src/app/organicmaps/editor/FeatureCategoryFragment.java b/android/src/app/organicmaps/editor/FeatureCategoryFragment.java
index d8b8c100ff..019bbab74f 100644
--- a/android/src/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/src/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -41,8 +41,9 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
   {
     super.onViewCreated(view, savedInstanceState);
 
-    if (getArguments() != null && getArguments().containsKey(FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY))
-      mSelectedCategory = getArguments().getParcelable(FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY);
+    final Bundle args = getArguments();
+    if (args != null && args.containsKey(FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY))
+      mSelectedCategory = Utils.getParcelable(args, FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY, FeatureCategory.class);
     mToolbarController = new SearchToolbarController(view, requireActivity())
     {
       @Override
diff --git a/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java
index 6063704d3e..d21bc2993b 100644
--- a/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -17,7 +17,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.tabs.TabLayout;
@@ -26,6 +25,7 @@ import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.editor.data.HoursMinutes;
 import app.organicmaps.util.DateUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.Utils;
 
 public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
 {
@@ -112,8 +112,10 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
   private void readArgs()
   {
     final Bundle args = getArguments();
-    mFrom = args.getParcelable(EXTRA_FROM);
-    mTo = args.getParcelable(EXTRA_TO);
+    if (args == null)
+      throw new IllegalArgumentException("Args must not be null");
+    mFrom = Utils.getParcelable(args, EXTRA_FROM, HoursMinutes.class);
+    mTo = Utils.getParcelable(args, EXTRA_TO, HoursMinutes.class);
     mSelectedTab = args.getInt(EXTRA_SELECT_FIRST);
     mId = args.getInt(EXTRA_ID);
   }
diff --git a/android/src/app/organicmaps/util/Utils.java b/android/src/app/organicmaps/util/Utils.java
index 3157fa2cb7..7338927e82 100644
--- a/android/src/app/organicmaps/util/Utils.java
+++ b/android/src/app/organicmaps/util/Utils.java
@@ -10,6 +10,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -810,4 +811,20 @@ public class Utils
       });
     }
   }
+
+  @Nullable
+  public static <T> T getParcelable(Bundle args, String key, Class<T> clazz)
+  {
+    args.setClassLoader(clazz.getClassLoader());
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+      return args.getParcelable(key, clazz);
+    return getParcelableOld(args, key);
+  }
+
+  @SuppressWarnings({"deprecation", "unchecked"})
+  @Nullable
+  private static <T> T getParcelableOld(Bundle args, String key)
+  {
+    return (T) args.getParcelable(key);
+  }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/DirectionFragment.java b/android/src/app/organicmaps/widget/placepage/DirectionFragment.java
index 9336239690..98c9cbf53f 100644
--- a/android/src/app/organicmaps/widget/placepage/DirectionFragment.java
+++ b/android/src/app/organicmaps/widget/placepage/DirectionFragment.java
@@ -19,6 +19,7 @@ import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;
 import app.organicmaps.widget.ArrowView;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 
 public class DirectionFragment extends BaseMwmDialogFragment
                             implements LocationListener
@@ -48,7 +49,7 @@ public class DirectionFragment extends BaseMwmDialogFragment
     });
     initViews(root);
     if (savedInstanceState != null)
-      setMapObject(savedInstanceState.getParcelable(EXTRA_MAP_OBJECT));
+      setMapObject(Utils.getParcelable(savedInstanceState, EXTRA_MAP_OBJECT, MapObject.class));
 
     return root;
   }
diff --git a/android/src/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/src/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
index 6cf329f205..9c6dae8799 100644
--- a/android/src/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/src/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -15,6 +15,7 @@ import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.ElevationInfo;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 
 import java.util.Objects;
 
@@ -140,7 +141,7 @@ public class ElevationProfileViewRenderer implements PlacePageViewRenderer<Place
   @Override
   public void onRestore(@NonNull Bundle inState)
   {
-    mElevationInfo = inState.getParcelable(PlacePageUtils.EXTRA_PLACE_PAGE_DATA);
+    mElevationInfo = Utils.getParcelable(inState, PlacePageUtils.EXTRA_PLACE_PAGE_DATA, ElevationInfo.class);
     if (mElevationInfo != null)
       render(mElevationInfo);
   }
diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageControllerComposite.java b/android/src/app/organicmaps/widget/placepage/PlacePageControllerComposite.java
index bfa3f8a330..5a258f73fa 100644
--- a/android/src/app/organicmaps/widget/placepage/PlacePageControllerComposite.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageControllerComposite.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
+import app.organicmaps.util.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -156,7 +157,7 @@ class PlacePageControllerComposite implements PlacePageController
   @Override
   public void onRestore(@NonNull Bundle inState)
   {
-    PlacePageData data = inState.getParcelable(PlacePageUtils.EXTRA_PLACE_PAGE_DATA);
+    PlacePageData data = Utils.getParcelable(inState, PlacePageUtils.EXTRA_PLACE_PAGE_DATA, PlacePageData.class);
     if (data != null)
     {
       PlacePageController controller = findControllerFor(data);
diff --git a/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java b/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java
index f49ed12f66..a3bcf73f61 100644
--- a/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java
+++ b/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java
@@ -18,6 +18,7 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import app.organicmaps.util.log.Logger;
 
@@ -275,7 +276,7 @@ public class RichPlacePageController implements PlacePageController, LocationLis
       return;
     }
 
-    MapObject object = inState.getParcelable(PlacePageUtils.EXTRA_PLACE_PAGE_DATA);
+    MapObject object = Utils.getParcelable(inState, PlacePageUtils.EXTRA_PLACE_PAGE_DATA, MapObject.class);
     if (object == null)
       return;