diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f380ac45128134cf2fb5273c7bb56b8aae1eae..b27335552ee90d74d3286dbd0b27a1d31877a2a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Add shutdown on backup feature ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/373))
 ### Bug fixes
 - Backup/Config.json rework for API key hardening ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/369))
+- Fix stack on ping result being falsy ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/371))
 ### Tweaks
 - Spelling mistake fixed in German lang file ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/370))
 - Backup failure warning (Tab text goes red) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/373))
diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py
index 3c94a7dd164a0151fc2b2d165d5b955683baffda..3cc52f888c1d763be95756f96712e34d14e88ec9 100644
--- a/app/classes/minecraft/stats.py
+++ b/app/classes/minecraft/stats.py
@@ -265,15 +265,24 @@ class Stats:
             logger.info(
                 "Unable to read the server icon due to the following error:", exc_info=e
             )
-
-        ping_data = {
-            "online": online_stats.get("online", 0),
-            "max": online_stats.get("max", 0),
-            "players": online_stats.get("players", 0),
-            "server_description": ping_obj.description,
-            "server_version": ping_obj.version,
-            "server_icon": server_icon,
-        }
+        if ping_obj:
+            ping_data = {
+                "online": online_stats.get("online", 0),
+                "max": online_stats.get("max", 0),
+                "players": online_stats.get("players", 0),
+                "server_description": ping_obj.description,
+                "server_version": ping_obj.version,
+                "server_icon": server_icon,
+            }
+        else:
+            ping_data = {
+                "online": online_stats.get("online", 0),
+                "max": online_stats.get("max", 0),
+                "players": online_stats.get("players", 0),
+                "server_description": "",
+                "server_version": "",
+                "server_icon": server_icon,
+            }
 
         return ping_data