diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index 9bf4eaadb5..032ee92e3a 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -1,16 +1,18 @@
-<?php namespace System\Classes;
+<?php
 
-use Str;
-use Lang;
+namespace System\Classes;
+
+use ApplicationException;
 use Cache;
 use Config;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Lang;
 use Storage;
-use Request;
+use SystemException;
 use Url;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
-use Illuminate\Filesystem\FilesystemAdapter;
-use ApplicationException;
-use SystemException;
+use Winter\Storm\Support\Str;
+use Winter\Storm\Support\Svg;
 
 /**
  * Provides abstraction level for the Media Library operations.
@@ -346,6 +348,15 @@ public function moveFile($oldPath, $newPath, $isRename = false)
         $newPath = self::validatePath($newPath);
         $fullNewPath = $this->getMediaPath($newPath);
 
+        // If the file extension is changed to SVG, ensure that it has been sanitized
+        $oldExt = pathinfo($oldPath, PATHINFO_EXTENSION);
+        $newExt = pathinfo($newPath, PATHINFO_EXTENSION);
+        if ($oldExt !== $newExt && $newExt === 'svg') {
+            $contents = $this->getStorageDisk()->get($fullOldPath);
+            $contents = Svg::sanitize($contents);
+            $this->getStorageDisk()->put($fullOldPath, $contents);
+        }
+
         return $this->getStorageDisk()->move($fullOldPath, $fullNewPath);
     }