diff --git a/extension.json b/extension.json
index b92cc2a58f..14bc80c141 100644
--- a/extension.json
+++ b/extension.json
@@ -136,6 +136,9 @@
 		"VisualEditorSingleEditTabSwitchTime": {
 			"value": 20160101000000
 		},
+		"VisualEditorSingleEditTabSwitchTimeEnd": {
+			"value": 20210101000000
+		},
 		"VisualEditorSkinToolbarScrollOffset": {
 			"value": []
 		},
diff --git a/includes/VisualEditorHooks.php b/includes/VisualEditorHooks.php
index 345d217870..a932f6391c 100644
--- a/includes/VisualEditorHooks.php
+++ b/includes/VisualEditorHooks.php
@@ -446,6 +446,7 @@ class VisualEditorHooks {
 
 		if (
 			$config->get( 'VisualEditorUseSingleEditTab' ) &&
+			wfTimestampNow() < $config->get( 'VisualEditorSingleEditTabSwitchTimeEnd' ) &&
 			$user->isRegistered() &&
 			!$user->getOption( 'visualeditor-autodisable' ) &&
 			!$user->getOption( 'visualeditor-betatempdisable' ) &&