diff --git a/GlobalSettings.php b/GlobalSettings.php
index d354365b1a..61b6a58694 100644
--- a/GlobalSettings.php
+++ b/GlobalSettings.php
@@ -11,6 +11,9 @@
 		'GlobalBlocking',
 		'RemovePII',
 	] );
+
+	$wgCookieSameSite = 'None';
+	$wgUseSameSiteLegacyCookies = true;
 }
 
 if ( $wi->isExtensionActive( 'chameleon' ) ) {
diff --git a/LocalWiki.php b/LocalWiki.php
index 9edb0d4c09..b507f22f9c 100644
--- a/LocalWiki.php
+++ b/LocalWiki.php
@@ -454,10 +454,10 @@ function onBeforePageDisplay( OutputPage $out ) {
 		$wgDplSettings['allowUnlimitedResults'] = true;
 
 		break;
-	case 'whentheycrywiki': 
+	case 'whentheycrywiki':
 		$wgGalleryOptions['imageWidth'] = 200;
 		$wgGalleryOptions['imageHeight'] = 200;
-			
+
 		break;
 	case 'wonderingstarswiki':
 		$wgPivotFeatures = [