diff --git a/app/Http/Controllers/SpaController.php b/app/Http/Controllers/SpaController.php
index 664286f78..a64a880b5 100644
--- a/app/Http/Controllers/SpaController.php
+++ b/app/Http/Controllers/SpaController.php
@@ -126,4 +126,13 @@ class SpaController extends Controller
 		}
 		return redirect('/i/web/profile/' . $id);
 	}
+
+	public function hashtagRedirect(Request $request, $tag)
+	{
+		if(!$request->user()) {
+			return redirect('/discover/tags/' . $tag);
+		}
+
+		return view('layouts.spa');
+	}
 }
diff --git a/routes/web.php b/routes/web.php
index 0cb0c9507..cd46c012f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -351,6 +351,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
 		Route::post('warning', 'AccountInterstitialController@read');
 		Route::get('my2020', 'SeasonalController@yearInReview');
 
+		Route::get('web/hashtag/{tag}', 'SpaController@hashtagRedirect');
 		Route::get('web/username/{id}', 'SpaController@usernameRedirect');
 		Route::get('web/post/{id}', 'SpaController@webPost');
 		Route::get('web/profile/{id}', 'SpaController@webProfile');