diff --git a/java/src/org/openqa/selenium/grid/security/SecretOptions.java b/java/src/org/openqa/selenium/grid/security/SecretOptions.java
index 35c57458f353d..ee72015b969f8 100644
--- a/java/src/org/openqa/selenium/grid/security/SecretOptions.java
+++ b/java/src/org/openqa/selenium/grid/security/SecretOptions.java
@@ -41,8 +41,7 @@ public SecretOptions(Config config) {
 
   public Secret getRegistrationSecret() {
     String secret = "";
-    if ((isSecure() || isSelfSigned())
-        && !config.get(SERVER_SECTION, "registration-secret").isPresent()) {
+    if ((isSecure()) && !config.get(SERVER_SECTION, "registration-secret").isPresent()) {
       try {
         secret =
             getEncoder()