diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStorageDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStorageDTO.java
index 2fb966a6e7..195d9da973 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStorageDTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceStorageDTO.java
@@ -69,12 +69,7 @@ public class DatasourceStorageDTO implements Forkable<DatasourceStorageDTO> {
         }
 
         if (!Boolean.TRUE.equals(forkWithConfiguration)) {
-            DatasourceConfiguration dsConfig = new DatasourceConfiguration();
-            dsConfig.setAuthentication(null);
-            if (newDatasourceStorageDTO.getDatasourceConfiguration() != null) {
-                dsConfig.setConnection(newDatasourceStorageDTO.getDatasourceConfiguration().getConnection());
-            }
-            newDatasourceStorageDTO.setDatasourceConfiguration(dsConfig);
+            newDatasourceStorageDTO.setDatasourceConfiguration(null);
         }
 
         /*
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ForkExamplesWorkspaceServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ForkExamplesWorkspaceServiceTests.java
index 20bfdbdf93..bff68fbad8 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ForkExamplesWorkspaceServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ForkExamplesWorkspaceServiceTests.java
@@ -1282,11 +1282,11 @@ public class ForkExamplesWorkspaceServiceTests {
 
                     final Datasource ds1 = data.datasources.stream().filter(ds -> ds.getName().equals("datasource 1")).findFirst().get();
                     DatasourceStorageDTO storage1 = ds1.getDatasourceStorages().get(data.defaultEnvironmentId);
-                    assertThat(storage1.getDatasourceConfiguration().getAuthentication()).isNull();
+                    assertThat(storage1.getDatasourceConfiguration()).isNull();
 
                     final Datasource ds2 = data.datasources.stream().filter(ds -> ds.getName().equals("datasource 2")).findFirst().get();
                     DatasourceStorageDTO storage2 = ds2.getDatasourceStorages().get(data.defaultEnvironmentId);
-                    assertThat(storage2.getDatasourceConfiguration().getAuthentication()).isNull();
+                    assertThat(storage2.getDatasourceConfiguration()).isNull();
 
                     assertThat(getUnpublishedActionName(data.actions)).containsExactlyInAnyOrder(
                             "action1",