diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index 6c6a37dd..675364cb 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -787,6 +787,10 @@ function checkMerge() {
             'data'=>Json::encode($oldNation)
         ]);
 
+        $db->update('general', [
+            'nation'=>0,
+        ], 'nation=%i AND npc = 5', $me['nation']);
+
         $query = "delete from nation where nation='{$me['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $db->delete('nation_turn', 'nation_id=%i', $me['nation']);
@@ -940,6 +944,10 @@ function checkSurrender() {
             'data'=>Json::encode($oldNation)
         ]);
 
+        $db->update('general', [
+            'nation'=>0,
+        ], 'nation=%i AND npc = 5', $me['nation']);
+
         $query = "delete from nation where nation='{$me['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $db->delete('nation_turn', 'nation_id=%i', $me['nation']);