diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 420bee61..cc45c424 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -139,8 +139,13 @@ public class AuthMePlayerListener implements Listener {
             return;
 
         if (!Settings.isMovementAllowed) {
-            if (!event.getFrom().getBlock().equals(event.getTo().getBlock()))
+            if (Settings.isRemoveSpeedEnabled) {
+                player.setWalkSpeed(0.0f);
+                player.setFlySpeed(0.0f);
+            }
+            if (!event.getFrom().getBlock().equals(event.getTo().getBlock())) {
                 event.setTo(event.getFrom());
+            }
             return;
         }