diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java
index 1b6af6f..843af74 100644
--- a/Emulator/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java
+++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java
@@ -270,7 +270,18 @@ public class SubscriptionHabboClub extends Subscription {
                         HabboInfo habboInfo = Emulator.getGameEnvironment().getHabboManager().getHabboInfo(userId);
 
                         if (habboInfo == null) {
-                            SubscriptionManager.LOGGER.error("HabboInfo is null for user #" + userId);
+                            SubscriptionManager.LOGGER.error("HabboInfo is null for user #" + userId + ". Removing subscription.");
+
+                            // Remove subscription from the database
+                            try (PreparedStatement removeStatement = connection.prepareStatement(
+                                    "DELETE FROM users_subscriptions WHERE user_id = ? AND subscription_type = ?")) {
+                                removeStatement.setInt(1, userId);
+                                removeStatement.setString(2, Subscription.HABBO_CLUB);
+                                removeStatement.executeUpdate();
+                            } catch (SQLException e) {
+                                SubscriptionManager.LOGGER.error("SQL exception when trying to remove subscription for user #" + userId, e);
+                            }
+
                             continue;
                         }
 
diff --git a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar
index 6b97e79..f5eec3a 100644
Binary files a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar differ