diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
index 79e4c2d2b..a6d25c897 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
@@ -383,14 +383,14 @@ public class VelocityConfiguration implements ProxyConfig {
     // Handle any cases where the config needs to be saved again
     byte[] forwardingSecret;
     String forwardingSecretString = config.get("forwarding-secret");
-    if (forwardingSecretString.isEmpty()) {
+    if (forwardingSecretString == null || forwardingSecretString.isEmpty()) {
       forwardingSecretString = generateRandomString(12);
       config.set("forwarding-secret", forwardingSecretString);
       mustResave = true;
     }
     forwardingSecret = forwardingSecretString.getBytes(StandardCharsets.UTF_8);
 
-    if (config.<String>get("metrics.id").isEmpty()) {
+    if (!config.contains("metrics.id") || config.<String>get("metrics.id").isEmpty()) {
       config.set("metrics.id", UUID.randomUUID().toString());
       mustResave = true;
     }