diff --git a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
index 38ac8392..0c6678a2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
@@ -39,8 +39,16 @@ namespace HandyControl.Controls
         private static void OnUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var ctl = (GifImage) d;
-            var v = (Uri)e.NewValue;
-            ctl.Source = new BitmapImage(v);
+
+            if (e.NewValue != null)
+            {
+                var v = (Uri)e.NewValue;
+                ctl.Source = new BitmapImage(v);
+            }
+            else
+            {
+                ctl.Source = null;
+            }
         }
 
         public Uri Uri