diff --git a/src/BitooBitImageEditor.Droid/BitooBitImageEditor.Droid.csproj b/src/BitooBitImageEditor.Droid/BitooBitImageEditor.Droid.csproj
index dd781c1..416e6dc 100644
--- a/src/BitooBitImageEditor.Droid/BitooBitImageEditor.Droid.csproj
+++ b/src/BitooBitImageEditor.Droid/BitooBitImageEditor.Droid.csproj
@@ -65,9 +65,6 @@
     <PackageReference Include="Xamarin.Forms">
       <Version>4.8.0.1560</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.MediaGallery">
-      <Version>1.0.0</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\strings.xml" />
@@ -76,6 +73,10 @@
     <Folder Include="Resources\drawable\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Xamarin.MediaGallery\MediaGallery\MediaGallery.csproj">
+      <Project>{adcee700-ebbf-4eb1-bcb7-efd9ed395fa1}</Project>
+      <Name>MediaGallery</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BitooBitImageEditor\BitooBitImageEditor.csproj">
       <Project>{ED478E09-15E7-43AA-A99B-ECEA618971E6}</Project>
       <Name>BitooBitImageEditor</Name>
diff --git a/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj b/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj
index ffb4db6..1d1bd34 100644
--- a/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj
+++ b/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj
@@ -50,6 +50,10 @@
     <Compile Include="TouchRecognizer.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Xamarin.MediaGallery\MediaGallery\MediaGallery.csproj">
+      <Project>{adcee700-ebbf-4eb1-bcb7-efd9ed395fa1}</Project>
+      <Name>MediaGallery</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BitooBitImageEditor\BitooBitImageEditor.csproj">
       <Project>{ED478E09-15E7-43AA-A99B-ECEA618971E6}</Project>
       <Name>BitooBitImageEditor</Name>
@@ -62,9 +66,6 @@
     <PackageReference Include="Xamarin.Forms">
       <Version>4.8.0.1560</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.MediaGallery">
-      <Version>1.0.0</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/BitooBitImageEditor/BitooBitImageEditor.csproj b/src/BitooBitImageEditor/BitooBitImageEditor.csproj
index 028039d..41a76cd 100644
--- a/src/BitooBitImageEditor/BitooBitImageEditor.csproj
+++ b/src/BitooBitImageEditor/BitooBitImageEditor.csproj
@@ -107,7 +107,10 @@
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.2" />
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1560" />
-    <PackageReference Include="Xamarin.MediaGallery" Version="1.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Xamarin.MediaGallery\MediaGallery\MediaGallery.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BitooBitImageEditor/Croping/ImageCropperCanvasView.cs b/src/BitooBitImageEditor/Croping/ImageCropperCanvasView.cs
index 7b32a2e..8a26578 100644
--- a/src/BitooBitImageEditor/Croping/ImageCropperCanvasView.cs
+++ b/src/BitooBitImageEditor/Croping/ImageCropperCanvasView.cs
@@ -154,6 +154,8 @@ protected override void OnPaintSurface(SKPaintSurfaceEventArgs args)
         {
             base.OnPaintSurface(args);
 
+            if (bitmap == null) return;
+
             SKImageInfo info = args.Info;
             SKSurface surface = args.Surface;
             SKCanvas canvas = surface.Canvas;