diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py
index 30b78697..1e45bf7e 100644
--- a/app/classes/minecraft/stats.py
+++ b/app/classes/minecraft/stats.py
@@ -219,7 +219,8 @@ class Stats:
 
             # TODO: search server properties file for possible override of 127.0.0.1
             internal_ip = server_data.get('server_ip', "127.0.0.1")
-            server_port = server_settings.get('server-port', "25565")
+            server_port = server_data.get('server_port', "25565")
+            print('PORT', server_port)
 
             logger.debug("Pinging server '{}' on {}:{}".format(s.get('server_name', "ID#{}".format(server_id)), internal_ip, server_port))
             int_mc_ping = ping(internal_ip, int(server_port))
@@ -277,7 +278,9 @@ class Stats:
 
         # TODO: search server properties file for possible override of 127.0.0.1
         internal_ip = server_data.get('server_ip', "127.0.0.1")
-        server_port = server_settings.get('server-port', "25565")
+        server_port = server_data.get('server_port', "25565")
+        print(internal_ip)
+        print(server_port)
 
         logger.debug("Pinging server '{}' on {}:{}".format(server.name, internal_ip, server_port))
         int_mc_ping = ping(internal_ip, int(server_port))
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 9ef79984..8ef1b21c 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -622,19 +622,12 @@ class PanelHandler(BaseHandler):
                 Servers.logs_delete_after: logs_delete_after,
             }).where(Servers.server_id == server_id).execute()
 
-            Server_Stats.update({
-                Server_Stats.server_port: server_port,
-            }).where(Server_Stats.server_id == server_id).execute()
-
             self.controller.refresh_server_settings(server_id)
 
             db_helper.add_to_audit_log(exec_user['user_id'],
                                        "Edited server {} named {}".format(server_id, server_name),
                                        server_id,
                                        self.get_remote_ip())
-            
-            svr = self.controller.get_server_obj(server_id)
-            svr.reload_server_settings()
 
             self.redirect("/panel/server_detail?id={}&subpage=config".format(server_id))