diff --git a/ciphers/Caesar.java b/ciphers/Caesar.java
index 77cd5b9eb..a2c11db38 100644
--- a/ciphers/Caesar.java
+++ b/ciphers/Caesar.java
@@ -24,8 +24,8 @@ public class Caesar {
     public static String encode(String message, int shift) {
         String encoded = "";
 
-        while (shift >= 26) { // 26 = number of latin letters
-            shift -= 26;
+        if (shift >= 26) { // 26 = number of latin letters
+            shift %= 26;
         }
 
         final int length = message.length();
@@ -62,8 +62,8 @@ public class Caesar {
     public static String decode(String encryptedMessage, int shift) {
         String decoded = "";
 
-        while (shift >= 26) { // 26 = number of latin letters
-            shift -= 26;
+        if (shift >= 26) { // 26 = number of latin letters
+            shift %= 26;
         }
 
         final int length = encryptedMessage.length();