diff --git a/kernel/private/classes/ezplanguageswitcher.php b/kernel/private/classes/ezplanguageswitcher.php
index 0701173ded5..1dab014fc38 100644
--- a/kernel/private/classes/ezplanguageswitcher.php
+++ b/kernel/private/classes/ezplanguageswitcher.php
@@ -51,7 +51,6 @@ function __construct( $params = null )
     /**
      * Get instance siteaccess specific site.ini
      *
-     * @param string $sa
      * @return void
      */
     protected function getSiteAccessIni()
@@ -142,7 +141,7 @@ protected static function removePathPrefixIfNeeded( eZINI $saIni, &$url )
             $pathPrefix = $saIni->variable( 'SiteAccessSettings', 'PathPrefix' );
             if ( !empty( $pathPrefix ) )
             {
-                if ( strpos( $url, $pathPrefix . '/' ) === 0 )
+                if ( ( strpos( $url, $pathPrefix . '/' ) === 0 ) || ( $pathPrefix === $url ) )
                 {
                     $url = substr( $url, strlen( $pathPrefix ) + 1 );
                 }
@@ -159,8 +158,6 @@ protected static function removePathPrefixIfNeeded( eZINI $saIni, &$url )
     /**
      * Returns URL alias for the specified <var>$locale</var>
      *
-     * @param string $url
-     * @param string $locale
      * @return void
      */
     public function destinationUrl()