diff --git a/src/main/java/stirling/software/SPDF/config/AppConfig.java b/src/main/java/stirling/software/SPDF/config/AppConfig.java
index c1c67affb..e674f6134 100644
--- a/src/main/java/stirling/software/SPDF/config/AppConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java
@@ -119,18 +119,16 @@ public class AppConfig {
                                 .getUploadLimit()
                                 .getEnableUploadSizeLimit()
                         : false;
-        if (!uploadLimit) {
-            return 0;
-        }
+
         String maxUploadSize = applicationProperties.getSystem().getUploadLimit().getLimit();
-        if (!new Regex("^[1-9][0-9]{0,2}[K|M|G]B$").matches(maxUploadSize)) {
+
+        if (!uploadLimit || maxUploadSize == null || maxUploadSize.isEmpty()) {
+            return 0;
+        } else if (!new Regex("^[1-9][0-9]{0,2}[K|M|G]B$").matches(maxUploadSize)) {
             log.error(
                     "Invalid maxUploadSize format. Expected format: {1,3}[0-9][K|M|G]B, but got: {}",
                     maxUploadSize);
             return 0;
-        }
-        if (maxUploadSize == null || maxUploadSize.isEmpty()) {
-            return 0;
         } else {
             String unit = maxUploadSize.replaceAll("[1-9][0-9]{0,2}", "");
             String number = maxUploadSize.replaceAll("[K|M|G]B", "");