diff --git a/dislocker.py b/dislocker.py
index 51da894..1273cc0 100644
--- a/dislocker.py
+++ b/dislocker.py
@@ -162,7 +162,7 @@ class Bot(discord.Client):
                 return {"result": 1, "about": "user_data_not_found"}
 
         except Exception as error:
-            print("キーボードの使用状況を調査中にエラーが発生しました。\nエラー内容")
+            print("ユーザーの登録状態を調査中にエラーが発生しました。\nエラー内容")
             print(str(error.__class__.__name__))
             print(str(error.args))
             print(str(error))
@@ -546,7 +546,6 @@ class Bot(discord.Client):
                 pc_list_record = cursor.fetchall()
                 pc_using_member_id = pc_list_record[0][1]
                 pc_password_hash = pc_list_record[0][2]
-
                 if pc_using_member_id == None:
                     return {"result": 1, "about": "not_used"}
                 else:
@@ -558,8 +557,18 @@ class Bot(discord.Client):
                     cursor.execute("SELECT * FROM pc_usage_history WHERE member_id = %s AND pc_number = %s ORDER BY id DESC LIMIT 1", (pc_using_member_id, pc_number))
                     pc_usage_history_record = cursor.fetchall()
                     pc_usage_history_record_id = pc_usage_history_record[0][0]
-                    keyboard_id = pc_usage_history_record[0][3]
-                    mouse_id = pc_usage_history_record[0][4]
+                    keyboard_number = pc_usage_history_record[0][3]
+                    mouse_number = pc_usage_history_record[0][4]
+                    if keyboard_number == None:
+                        pass
+                    else:
+                        # keyboard_listの使用中ユーザーを消す
+                        cursor.execute("UPDATE keyboard_list SET using_member_id = NULL WHERE keyboard_number = %s", (keyboard_number,))
+                    if mouse_number == None:
+                        pass
+                    else:
+                        # mouse_listの使用中ユーザーを消す
+                        cursor.execute("UPDATE mouse_list SET using_member_id = NULL WHERE keyboard_number = %s", (mouse_number,))
                     cursor.execute("UPDATE pc_usage_history SET end_use_time = clock_timestamp(), bot_about = %s WHERE id = %s", (bot_about, pc_usage_history_record_id))
                     dislocker.db.commit()
                     return {"result": 0, "about": "ok"}