diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551e971b..57bc414a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@ TBD
 ### Tweaks
 - Add better error logging for statistic collection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/359))
 
+## [4.0.2-hotfix1] - 2022/06/17
+
+### Crit Bug fixes
+Fix blank server_detail page for general users ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/358))
+
 ## [4.0.2] - 2022/06/16
 
 ### New features
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 295fbded..bb44138f 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -183,6 +183,7 @@ class PanelHandler(BaseHandler):
                 logger.debug(f'User {exec_user["user_id"]} does not have permission')
                 self.redirect("/panel/error?error=Invalid Server ID")
                 return None
+        return server_id
 
     # Server fetching, spawned asynchronously
     # TODO: Make the related front-end elements update with AJAX