diff --git a/src/main/java/fr/xephi/authme/data/limbo/LimboServiceHelper.java b/src/main/java/fr/xephi/authme/data/limbo/LimboServiceHelper.java
index 7373212f..6b3acfcb 100644
--- a/src/main/java/fr/xephi/authme/data/limbo/LimboServiceHelper.java
+++ b/src/main/java/fr/xephi/authme/data/limbo/LimboServiceHelper.java
@@ -57,8 +57,7 @@ class LimboServiceHelper {
         player.setOp(false);
         player.setAllowFlight(false);
 
-        if (!settings.getProperty(RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT)
-            && settings.getProperty(RestrictionSettings.REMOVE_SPEED)) {
+        if (!settings.getProperty(RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT)) {
             player.setFlySpeed(0.0f);
             player.setWalkSpeed(0.0f);
         }
diff --git a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
index 40de8ca6..009fb59a 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
@@ -107,12 +107,6 @@ public final class RestrictionSettings implements SettingsHolder {
     public static final Property<Boolean> ALLOW_UNAUTHED_MOVEMENT =
         newProperty("settings.restrictions.allowMovement", false);
 
-    @Comment({
-        "Should not authenticated players have speed = 0?",
-        "This will reset the fly/walk speed to default value after the login."})
-    public static final Property<Boolean> REMOVE_SPEED =
-        newProperty("settings.restrictions.removeSpeed", true);
-
     @Comment({
         "After how many seconds should players who fail to login or register",
         "be kicked? Set to 0 to disable."})
diff --git a/src/test/java/fr/xephi/authme/data/limbo/LimboServiceTest.java b/src/test/java/fr/xephi/authme/data/limbo/LimboServiceTest.java
index 807024cd..740d7a6b 100644
--- a/src/test/java/fr/xephi/authme/data/limbo/LimboServiceTest.java
+++ b/src/test/java/fr/xephi/authme/data/limbo/LimboServiceTest.java
@@ -69,7 +69,6 @@ public class LimboServiceTest {
     @Before
     public void mockSettings() {
         given(settings.getProperty(RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT)).willReturn(false);
-        given(settings.getProperty(RestrictionSettings.REMOVE_SPEED)).willReturn(true);
     }
 
     @Test