diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/InstanceAdminControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/InstanceAdminControllerCE.java
index abde37a484..c1f12b85e3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/InstanceAdminControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/InstanceAdminControllerCE.java
@@ -2,7 +2,6 @@ package com.appsmith.server.controllers.ce;
 
 import com.appsmith.external.views.Views;
 import com.appsmith.server.constants.Url;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
 import com.appsmith.server.solutions.EnvManager;
@@ -48,21 +47,20 @@ public class InstanceAdminControllerCE {
     @PutMapping(
             value = "/env",
             consumes = {MediaType.APPLICATION_JSON_VALUE})
-    public Mono<ResponseDTO<EnvChangesResponseDTO>> saveEnvChangesJSON(
-            @Valid @RequestBody Map<String, String> changes) {
+    public Mono<ResponseDTO<Void>> saveEnvChangesJSON(@Valid @RequestBody Map<String, String> changes) {
         log.debug("Applying env updates {}", changes.keySet());
-        return envManager.applyChanges(changes).map(res -> new ResponseDTO<>(HttpStatus.OK.value(), res, null));
+        return envManager.applyChanges(changes).thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
     }
 
     @JsonView(Views.Public.class)
     @PutMapping(
             value = "/env",
             consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-    public Mono<ResponseDTO<EnvChangesResponseDTO>> saveEnvChangesMultipartFormData(ServerWebExchange exchange) {
+    public Mono<ResponseDTO<Void>> saveEnvChangesMultipartFormData(ServerWebExchange exchange) {
         log.debug("Applying env updates from form data");
         return exchange.getMultipartData()
                 .flatMap(envManager::applyChangesFromMultipartFormData)
-                .map(res -> new ResponseDTO<>(HttpStatus.OK.value(), res, null));
+                .thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
     }
 
     @JsonView(Views.Public.class)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/EnvChangesResponseDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/EnvChangesResponseDTO.java
deleted file mode 100644
index 285623af89..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/EnvChangesResponseDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.appsmith.server.dtos;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class EnvChangesResponseDTO {
-
-    @JsonProperty(value = "isRestartRequired")
-    boolean isRestartRequired;
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java
index 2f7970e4b0..3531cba174 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java
@@ -1,7 +1,6 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.domains.User;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
 import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.util.MultiValueMap;
@@ -15,9 +14,9 @@ public interface EnvManagerCE {
 
     List<String> transformEnvContent(String envContent, Map<String, String> changes);
 
-    Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes);
+    Mono<Void> applyChanges(Map<String, String> changes);
 
-    Mono<EnvChangesResponseDTO> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData);
+    Mono<Void> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData);
 
     void setAnalyticsEventAction(
             Map<String, Object> properties, String newVariable, String originalVariable, String authEnv);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
index 9ff4820886..d52441def1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
@@ -9,7 +9,6 @@ import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Tenant;
 import com.appsmith.server.domains.TenantConfiguration;
 import com.appsmith.server.domains.User;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
 import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
@@ -336,7 +335,7 @@ public class EnvManagerCEImpl implements EnvManagerCE {
     }
 
     @Override
-    public Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes) {
+    public Mono<Void> applyChanges(Map<String, String> changes) {
         // This flow is pertinent for any variables that need to change in the .env file or be saved in the tenant
         // configuration
         return verifyCurrentUserIsSuper()
@@ -417,8 +416,7 @@ public class EnvManagerCEImpl implements EnvManagerCE {
                         emailConfig.setEmailEnabled("true".equals(changesCopy.remove(APPSMITH_MAIL_SMTP_AUTH.name())));
                     }
 
-                    if (javaMailSender instanceof JavaMailSenderImpl) {
-                        JavaMailSenderImpl javaMailSenderImpl = (JavaMailSenderImpl) javaMailSender;
+                    if (javaMailSender instanceof JavaMailSenderImpl javaMailSenderImpl) {
                         if (changesCopy.containsKey(APPSMITH_MAIL_HOST.name())) {
                             javaMailSenderImpl.setHost(changesCopy.remove(APPSMITH_MAIL_HOST.name()));
                         }
@@ -446,12 +444,12 @@ public class EnvManagerCEImpl implements EnvManagerCE {
                                 "true".equals(changesCopy.remove(APPSMITH_DISABLE_TELEMETRY.name())));
                     }
 
-                    return dependentTasks.thenReturn(new EnvChangesResponseDTO(true));
+                    return dependentTasks.then();
                 });
     }
 
     @Override
-    public Mono<EnvChangesResponseDTO> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData) {
+    public Mono<Void> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData) {
         return Flux.fromIterable(formData.entrySet())
                 .flatMap(entry -> {
                     final String key = entry.getKey();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
index d9196668ee..34d79bbd09 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
@@ -8,7 +8,6 @@ import com.appsmith.server.domains.LoginSource;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.domains.UserState;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
 import com.appsmith.server.dtos.UserSignupDTO;
 import com.appsmith.server.dtos.UserSignupRequestDTO;
 import com.appsmith.server.exceptions.AppsmithError;
@@ -279,17 +278,20 @@ public class UserSignupCEImpl implements UserSignupCE {
                                 return pair.getT2();
                             });
 
-                    Mono<EnvChangesResponseDTO> applyEnvManagerChangesMono = envManager
+                    Mono<Void> applyEnvManagerChangesMono = envManager
                             .applyChanges(Map.of(
                                     APPSMITH_DISABLE_TELEMETRY.name(),
                                     String.valueOf(!userFromRequest.isAllowCollectingAnonymousData()),
                                     APPSMITH_ADMIN_EMAILS.name(),
                                     user.getEmail()))
+                            // We need a non-empty value for `.elapsed` to work.
+                            .thenReturn(true)
                             .elapsed()
                             .map(pair -> {
                                 log.debug("UserSignupCEImpl::Time taken to apply env changes: {} ms", pair.getT1());
                                 return pair.getT2();
-                            });
+                            })
+                            .then();
 
                     /*
                      * Here, we have decided to move these 2 analytics events to a separate thread.