diff --git a/hwe/c_vote.php b/hwe/c_vote.php
index 6fca9aab..c3bc137e 100644
--- a/hwe/c_vote.php
+++ b/hwe/c_vote.php
@@ -43,9 +43,6 @@ else if($btn == "댓글" && $comment != "") {
     $comment = addslashes(SQ2DQ($comment));
 
     $nation = getNationStaticInfo($me['nation']);
-    if($nation == null) { 
-        $nation = ['name' => "재야"]; 
-    }
 
     if($admin['votecomment'] != "") { $admin['votecomment'] .= "|"; }
     $admin['votecomment'] .= "{$nation['name']}:{$me['name']}:{$comment}";
diff --git a/hwe/func.php b/hwe/func.php
index f0d786b3..738256e6 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1468,13 +1468,13 @@ function checkDelay() {
 function updateOnline() {
     $db = DB::db();
     $connect=$db->get();
-    $nationname = [];
+    $nationname = ["재야"];
 
     //국가별 이름 매핑
     foreach(getAllNationStaticInfo() as $nation) {
         $nationname[$nation['nation']] = $nation['name'];
     }
-    $nationname[0] = "재야";
+
 
     //동접수
     $query = "select no,name,nation from general where lastrefresh > DATE_SUB(NOW(), INTERVAL 5 MINUTE)";
diff --git a/hwe/func_message.php b/hwe/func_message.php
index 63d2497d..ba178c9e 100644
--- a/hwe/func_message.php
+++ b/hwe/func_message.php
@@ -72,13 +72,7 @@ function DecodeMsg($msg, $type, $who, $date, $bg, $num=0) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $sndr = MYDB_fetch_array($result);
 
-    if($sndr['nation'] == 0) {
-        $sndrnation = [];
-        $sndrnation['name'] = '재야';
-        $sndrnation['color'] = '#000000';
-    } else {
-        $sndrnation = getNationStaticInfo($sndr['nation']);
-    }
+    $sndrnation = getNationStaticInfo($sndr['nation']);
 
     switch($bg) {
         case 2:
@@ -100,13 +94,7 @@ function DecodeMsg($msg, $type, $who, $date, $bg, $num=0) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $rcvr = MYDB_fetch_array($result);
 
-        if($rcvr['nation'] == 0) {
-            $rcvrnation = [];
-            $rcvrnation['name'] = '재야';
-            $rcvrnation['color'] = '#000000';
-        } else {
-            $rcvrnation = getNationStaticInfo($rcvr['nation']);
-        }
+        $rcvrnation = getNationStaticInfo($rcvr['nation']);
         ShowMsg($bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], "{$rcvr['name']}:{$rcvrnation['name']}", $rcvrnation['color'], $msg, $date, $num, $from, $term);
     }
 }