diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 55fa554..5246d36 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -31,6 +31,8 @@ class SvgHandler extends ImageHandler {
 
 	function isEnabled() {
 		global $wgSVGConverters, $wgSVGConverter;
+		if ( $wgSVGConverter == 'none' )
+			return true;
 		if ( !isset( $wgSVGConverters[$wgSVGConverter] ) ) {
 			wfDebug( "\$wgSVGConverter is invalid, disabling SVG rendering.\n" );
 			return false;
@@ -40,7 +42,7 @@ class SvgHandler extends ImageHandler {
 	}
 
 	function mustRender( $file ) {
-		return true;
+		return false;
 	}
 
 	function isVectorized( $file ) {
@@ -108,6 +110,7 @@ class SvgHandler extends ImageHandler {
 	 * @return bool|MediaTransformError|ThumbnailImage|TransformParameterError
 	 */
 	function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
+	global $wgSVGConverter;
 		if ( !$this->normaliseParams( $image, $params ) ) {
 			return new TransformParameterError( $params );
 		}
@@ -115,6 +118,11 @@ class SvgHandler extends ImageHandler {
 		$clientHeight = $params['height'];
 		$physicalWidth = $params['physicalWidth'];
 		$physicalHeight = $params['physicalHeight'];
+		
+		if ( $wgSVGConverter == 'none' )
+		{
+			return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, null );
+		}
 
 		if ( $flags & self::TRANSFORM_LATER ) {
 			return new ThumbnailImage( $image, $dstUrl, $dstPath, $params );
@@ -217,6 +225,9 @@ class SvgHandler extends ImageHandler {
 	}
 
 	function getThumbType( $ext, $mime, $params = null ) {
+	global $wgSVGConverter;
+		if ( $wgSVGConverter == 'none' )
+			return array( 'svg', 'image/xml+svg' );
 		return array( 'png', 'image/png' );
 	}