diff --git a/wp-admin/wp-options-permalink.php b/wp-admin/wp-options-permalink.php
index 9d5e5320b..f05fb69c7 100644
--- a/wp-admin/wp-options-permalink.php
+++ b/wp-admin/wp-options-permalink.php
@@ -122,8 +122,10 @@ $queryreplace = array (
 
 
 $match = str_replace('/', '/?', $permalink_structure);
-$match = str_replace($rewritecode, $rewritereplace, $match);
+$match = preg_replace('|/[?]|', '', $match, 1);
 
+$match = str_replace($rewritecode, $rewritereplace, $match);
+$match = preg_replace('|[?]|', '', $match, 1);
 preg_match_all('/%.+?%/', $permalink_structure, $tokens);
 
 $query = 'index.php?';