diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 7bbb9aa3a8..9a65b88cfb 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -75,7 +75,7 @@ class VisualEditorHooks {
 			$user->getOption( 'visualeditor-autodisable' ) ||
 			$user->getOption( 'visualeditor-tabs' ) === 'prefer-wt' ||
 			( $veConfig->get( 'VisualEditorDisableForAnons' ) && $user->isAnon() ) ||
-			false // TODO: Detect incompatibility - P2373
+			false // TODO: Detect incompatibility - T121298, P2373
 		) {
 			return true;
 		}
@@ -102,13 +102,13 @@ class VisualEditorHooks {
 			$title->getContentModel() !== CONTENT_MODEL_WIKITEXT ||
 			// check for parameters that VE does not handle
 			// TODO: other params too? See identical list in ve.init.mw.DesktopArticleTarget.init.js
-			in_array( 'veswitched', $params ) ||
 			in_array( 'undo', $params ) ||
 			in_array( 'undoafter', $params ) ||
 			in_array( 'editintro', $params ) ||
 			in_array( 'preload', $params ) ||
 			in_array( 'preloadtitle', $params ) ||
 			in_array( 'preloadparams', $params );
+			// Known-good parameters: edit, veaction, section, vesection, veswitched
 	}
 
 	/**
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 074babdfd7..a4b44abf74 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -713,13 +713,13 @@
 						)
 					)
 				) &&
-				uri.query.veswitched === undefined &&
 				uri.query.undo === undefined &&
 				uri.query.undoafter === undefined &&
 				uri.query.editintro === undefined &&
 				uri.query.preload === undefined &&
 				uri.query.preloadtitle === undefined &&
 				uri.query.preloadparams === undefined
+				// Known-good parameters: edit, veaction, section, vesection, veswitched
 				// TODO: other params too? See identical list in VisualEditor.hooks.php
 			) {
 				trackActivateStart( {