diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 5ff6547a11..80a614758a 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -87,8 +87,8 @@ $comments = array_slice($_comments, 0, 20);
 $extra_comments = array_slice($_comments, 20);
 
 $page_links = paginate_links( array(
-	'base' => clean_url( add_query_arg( 'apage', '%#%' ) ),
-	'format' => '',
+	'base' => 'edit-comments.php?%_%',
+	'format' => 'apage=%#%',
 	'total' => ceil($total / 20),
 	'current' => $page
 ));
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index e5afe98b8e..5018a8ec25 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -104,8 +104,8 @@ foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the curr
 				$per = 10;
 			}
 			$page_links = paginate_links( array(
-				'base' => add_query_arg( 'paged', '%#%' ),
-				'format' => '',
+				'base' => 'users.php?%_%',
+				'format' => 'paged=%#%',
 				'total' => ceil($total / $per),
 				'current' => $paged ? $paged : 1,
 				'prev_text' => '«',