diff --git a/token.tokens.inc b/token.tokens.inc
index 3dc2d3b..f156b79 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -673,12 +673,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
           $replacements[$original] = url($current_path, $url_options);
           break;
         case 'page-number':
-          if ($page = filter_input(INPUT_GET, 'page')) {
-            // @see PagerDefault::execute()
-            $pager_page_array = explode(',', $page);
-            $page = $pager_page_array[0];
-          }
-          $replacements[$original] = (int) $page + 1;
+          $replacements[$original] = pager_find_page() + 1;
           break;
       }
     }