diff --git a/app/Http/Middleware/RemoveSlashMiddleware.php b/app/Http/Middleware/RemoveSlashMiddleware.php
index ea2bfbac..321a642c 100644
--- a/app/Http/Middleware/RemoveSlashMiddleware.php
+++ b/app/Http/Middleware/RemoveSlashMiddleware.php
@@ -2,17 +2,19 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Support\Str;
+
 class RemoveSlashMiddleware
 {
     public function handle($request, \Closure $next)
     {
         if (substr($request->getRequestUri(), -1) == "/") {
-            $base_url = $request->getBaseUrl();
+            $base_dir = $request->getBaseUrl();
             // try to remove slash at the end of current url
             $new_url  = substr($request->getRequestUri(), 0, -1);
 
-            if ($new_url != $base_url) {
-                return redirect(str_replace($base_url, '', $new_url));
+            if ($new_url != $base_dir) {
+                return redirect(Str::replaceLast($base_dir, '', $new_url));
             }
         }