diff --git a/extension.json b/extension.json
index 4692ea4f..4d78d8d7 100644
--- a/extension.json
+++ b/extension.json
@@ -242,6 +242,7 @@
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
 		"ext.uls.interface": {
+			"targets": [ "desktop", "mobile" ],
 			"scripts": "js/ext.uls.interface.js",
 			"styles": "css/ext.uls.interface.less",
 			"dependencies": [
@@ -261,6 +262,7 @@
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
 		"ext.uls.interlanguage": {
+			"targets": [ "desktop", "mobile" ],
 			"styles": "css/ext.uls.interlanguage.less",
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
@@ -304,6 +306,10 @@
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
 		"ext.uls.preferences": {
+			"targets": [
+				"desktop",
+				"mobile"
+			],
 			"scripts": "js/ext.uls.preferences.js",
 			"dependencies": [
 				"mediawiki.user",
@@ -318,6 +324,7 @@
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
 		"ext.uls.pt": {
+			"targets": [ "desktop", "mobile" ],
 			"styles": "css/ext.uls.pt.less",
 			"localBasePath": "resources",
 			"skinStyles": {
@@ -326,6 +333,7 @@
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
 		"ext.uls.webfonts": {
+			"targets": [ "desktop", "mobile" ],
 			"scripts": "js/ext.uls.webfonts.js",
 			"dependencies": [
 				"ext.uls.common",
diff --git a/includes/UniversalLanguageSelectorHooks.php b/includes/UniversalLanguageSelectorHooks.php
index 647a401d..868491a2 100644
--- a/includes/UniversalLanguageSelectorHooks.php
+++ b/includes/UniversalLanguageSelectorHooks.php
@@ -116,8 +116,12 @@ class UniversalLanguageSelectorHooks {
 	 * @param Skin $skin
 	 * Hook: BeforePageDisplay
 	 */
-	public static function addModules( OutputPage $out, $skin ) {
+	public static function addModules( OutputPage $out, Skin $skin ) {
 		global $wgULSPosition, $wgULSGeoService;
+		$unsupportedSkins = [ 'minerva' ];
+		if ( in_array( $skin->getSkinName(), $unsupportedSkins ) ) {
+			return;
+		}
 
 		// Soft dependency to Wikibase client. Don't enable CLL if links are managed manually.
 		$excludedLinks = $out->getProperty( 'noexternallanglinks' );