diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFix.java b/common/src/main/java/org/embeddedt/modernfix/ModernFix.java
index d09454bd..d2bc73d0 100644
--- a/common/src/main/java/org/embeddedt/modernfix/ModernFix.java
+++ b/common/src/main/java/org/embeddedt/modernfix/ModernFix.java
@@ -70,7 +70,8 @@ public class ModernFix {
     public void onServerStarted() {
         if(ModernFixPlatformHooks.isDedicatedServer()) {
             float gameStartTime = ManagementFactory.getRuntimeMXBean().getUptime() / 1000f;
-            ModernFix.LOGGER.warn("Dedicated server took " + gameStartTime + " seconds to load");
+            if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.measure_time.ServerLoad"))
+                ModernFix.LOGGER.warn("Dedicated server took " + gameStartTime + " seconds to load");
             ModernFixPlatformHooks.onLaunchComplete();
         }
         ClassInfoManager.clear();
diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
index 74450b24..cca96b4a 100644
--- a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
+++ b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
@@ -65,7 +65,8 @@ public class ModernFixClient {
             worldLoadStartTime = System.nanoTime();
         } else if (openingScreen instanceof TitleScreen && gameStartTimeSeconds < 0) {
             gameStartTimeSeconds = ManagementFactory.getRuntimeMXBean().getUptime() / 1000f;
-            ModernFix.LOGGER.warn("Game took " + gameStartTimeSeconds + " seconds to start");
+            if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.measure_time.GameLoad"))
+                ModernFix.LOGGER.warn("Game took " + gameStartTimeSeconds + " seconds to start");
             ModernFixPlatformHooks.onLaunchComplete();
             ClassInfoManager.clear();
         }
@@ -86,8 +87,10 @@ public class ModernFixClient {
                 && Minecraft.getInstance().player != null
                 && numRenderTicks++ >= 10) {
             float timeSpentLoading = ((float)(System.nanoTime() - worldLoadStartTime) / 1000000000f);
-            ModernFix.LOGGER.warn("Time from main menu to in-game was " + timeSpentLoading + " seconds");
-            ModernFix.LOGGER.warn("Total time to load game and open world was " + (timeSpentLoading + gameStartTimeSeconds) + " seconds");
+            if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.measure_time.WorldLoad")) {
+                ModernFix.LOGGER.warn("Time from main menu to in-game was " + timeSpentLoading + " seconds");
+                ModernFix.LOGGER.warn("Total time to load game and open world was " + (timeSpentLoading + gameStartTimeSeconds) + " seconds");
+            }
             resetWorldLoadStateMachine();
         }
     }