diff --git a/server/src/checker.cpp b/server/src/checker.cpp
index 581e368..db1155a 100644
--- a/server/src/checker.cpp
+++ b/server/src/checker.cpp
@@ -111,17 +111,16 @@ void checker()
           if (type != SQL_NULL)
           {
             user_table_id = sql::column_int64(get_user_table_id_stmt, 0);
+            sql::bind_int64(rem_like_w_user_table_id_stmt, 1, user_table_id);
+            sql::step(rem_like_w_user_table_id_stmt);
+            sql::reset(rem_like_w_user_table_id_stmt);
+
+            sql::bind_int64(rem_user_table_id_stmt, 1, user_table_id);
+            sql::step(rem_user_table_id_stmt);
+            sql::reset(rem_user_table_id_stmt);
           }
         }
         sql::reset(get_user_table_id_stmt);
-
-        sql::bind_int64(rem_like_w_user_table_id_stmt, 1, user_table_id);
-        sql::step(rem_like_w_user_table_id_stmt);
-        sql::reset(rem_like_w_user_table_id_stmt);
-
-        sql::bind_int64(rem_user_table_id_stmt, 1, user_table_id);
-        sql::step(rem_user_table_id_stmt);
-        sql::reset(rem_user_table_id_stmt);
       }
 
       if (new_gen)
diff --git a/shared/inc/sql.hpp b/shared/inc/sql.hpp
index 17d10a7..baab27a 100644
--- a/shared/inc/sql.hpp
+++ b/shared/inc/sql.hpp
@@ -14,7 +14,7 @@ const char get_unchecked[] = "SELECT USER_ID FROM user_table WHERE CHECKED = 0;"
 
 const char get_gen[] = "SELECT lt.HASH, lt.POS, lt.LIKED FROM like_table lt JOIN user_table ut ON lt.USER_TABLE_ID = ut.ID WHERE ut.USER_ID = ? AND ut.GEN = ? ORDER BY lt.POS ASC;";
 
-const char get_user_table_id[] = "SELECT ID FROM user_table WHERE USER_ID = ? AND GEN = ?;";
+const char get_user_table_id[] = "SELECT ID FROM user_table WHERE USER_ID = ? AND GEN >= ?;";
 
 const char rem_like_w_user_table_id[] = "DELETE FROM like_table WHERE USER_TABLE_ID = ?;";