diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index e98028925..9494c6983 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -139,7 +139,7 @@ class memberController extends member
 		// Remove duplicated token key
 		$args = new stdClass;
 		$args->device_token = $device_token;
-		executeQuery('member.deleteMemberDeviceByToken', $args);
+		executeQuery('member.deleteMemberDevice', $args);
 
 		// Create member_device
 		$args = new stdClass;
@@ -205,7 +205,7 @@ class memberController extends member
 		{
 			return new BaseObject(-1, 'LOGIN_FAILED');
 		}
-		
+
 		$this->add('member_srl', $member_info->member_srl);
 		$this->add('user_id', $member_info->user_id);
 		$this->add('user_name', $member_info->user_name);
diff --git a/modules/member/queries/deleteMemberDevice.xml b/modules/member/queries/deleteMemberDevice.xml
index 1320b0df1..e84f9afaa 100644
--- a/modules/member/queries/deleteMemberDevice.xml
+++ b/modules/member/queries/deleteMemberDevice.xml
@@ -5,6 +5,6 @@
     <conditions>
         <condition operation="in" column="device_srl" var="device_srl" />
         <condition operation="in" column="member_srl" var="member_srl" pipe="and" />
-        <condition operation="in" column="device_token" var="device_token" pipe="and" />
+        <condition operation="in" column="device_token" var="device_token" notnull="notnull" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/member/queries/deleteMemberDeviceByToken.xml b/modules/member/queries/deleteMemberDeviceByToken.xml
deleted file mode 100644
index ad607cd14..000000000
--- a/modules/member/queries/deleteMemberDeviceByToken.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<query id="deleteMemberDeviceByToken" action="delete">
-    <tables>
-        <table name="member_devices" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="device_token" var="device_token" notnull="notnull" />
-    </conditions>
-</query>