diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
index fe567ca0d03..3d7a3d8223a 100644
--- a/mod/hotpot/lib.php
+++ b/mod/hotpot/lib.php
@@ -1723,7 +1723,10 @@ class hotpot_xml_quiz extends hotpot_xml_tree {
 			$quote = '["'."']?"; // single, double, or no quote
 
 			// patterns to media files types and paths
-			$filetype = "avi|mpeg|mpg|mp3|mov|wmv|swf|flv";
+            $filetype = "avi|mpeg|mpg|mp3|mov|wmv|flv";
+            if ($CFG->filter_mediaplugin_enable_swf) {
+                $filetype .= '|swf';
+            }
 			$filepath = ".*?\.($filetype)";
 
 			$tagopen = '(?:(<)|(\\\\u003C))'; // left angle-bracket (uses two parenthese)