diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 33dc2fd83..b088f3d86 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -196,6 +196,12 @@ class HTMLDisplayHandler
 		Context::set('favicon_url', $favicon_url);
 		Context::set('mobicon_url', $mobicon_url);
 
+		// Only print the X-UA-Compatible meta tag if somebody is still using IE
+		if (preg_match('!Trident/7\.0!', $_SERVER['HTTP_USER_AGENT'] ?? ''))
+		{
+			Context::addMetaTag('X-UA-Compatible', 'IE=edge', true);
+		}
+
 		return $output;
 	}
 
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 2e5c093dd..25638bc49 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -8,7 +8,6 @@
 <meta name="generator" content="Rhymix">
 <meta name="viewport" content="{{ config('mobile.viewport') ?? HTMLDisplayHandler::DEFAULT_VIEWPORT }}" />
 <meta name="csrf-token" content="{!! \Rhymix\Framework\Session::getGenericToken() !!}" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 @foreach (Context::getMetaTag() as $val)
 @if ($val['is_before_title'])
 <meta http-equiv="{{ $val['name'] }}"|if="$val['is_http_equiv']" name="{{ $val['name'] }}"|if="!$val['is_http_equiv']" content="{{ $val['content'] }}" />