diff --git a/crates/rspack_plugin_javascript/src/plugin/side_effects_flag_plugin.rs b/crates/rspack_plugin_javascript/src/plugin/side_effects_flag_plugin.rs
index d9a25f94571..cc5772ec35d 100644
--- a/crates/rspack_plugin_javascript/src/plugin/side_effects_flag_plugin.rs
+++ b/crates/rspack_plugin_javascript/src/plugin/side_effects_flag_plugin.rs
@@ -656,13 +656,6 @@ async fn nmf_module(
 
 #[plugin_hook(CompilationOptimizeDependencies for SideEffectsFlagPlugin)]
 fn optimize_dependencies(&self, compilation: &mut Compilation) -> Result<Option<bool>> {
-  let affected_modules = compilation
-    .unaffected_modules_cache
-    .get_affected_modules_with_chunk_graph()
-    .lock()
-    .expect("should lock")
-    .clone();
-  dbg!(affected_modules);
   // TODO: use affected module optimization
   let mut modules: IdentifierSet = compilation
     .get_module_graph()
@@ -670,24 +663,6 @@ fn optimize_dependencies(&self, compilation: &mut Compilation) -> Result<Option<
     .keys()
     .copied()
     .collect();
-
-  let mut modules: IdentifierSet = if compilation.options.new_incremental_enabled() {
-    compilation
-      .unaffected_modules_cache
-      .get_affected_modules_with_module_graph()
-      .lock()
-      .expect("should lock")
-      .iter()
-      .copied()
-      .collect()
-  } else {
-    compilation
-      .get_module_graph()
-      .modules()
-      .keys()
-      .copied()
-      .collect()
-  };
   let mut new_connections = Default::default();
   for module in modules.clone() {
     optimize_incoming_connections(module, &mut modules, &mut new_connections, compilation);
diff --git a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/index.js b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/index.js
index a96670132e0..34ce108bd13 100644
--- a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/index.js
+++ b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/index.js
@@ -1,4 +1,4 @@
-import {v as value} from "./module";
+import {value} from "./module";
 
 let v = value;
 module.hot.accept('./module', () => {
diff --git a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/module.js b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/module.js
index bfa077de4d7..de10e4d3031 100644
--- a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/module.js
+++ b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/module.js
@@ -1,7 +1,6 @@
 import {v} from './reexports'
-v;
-export {v};
-----
+//
+export const value = '' + v;
+---
 import {v} from './reexports'
-v;// no-op
-export {v};
+export const value = '' + v;
diff --git a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/package.json b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/package.json
index 1bb023b4fd3..9e26dfeeb6e 100644
--- a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/package.json
+++ b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/package.json
@@ -1,3 +1 @@
-{
-  "sideEffects": false
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/reexports.js b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/reexports.js
index d036786097d..d4c2fecf76c 100644
--- a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/reexports.js
+++ b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/reexports.js
@@ -1,2 +1 @@
-import {v} from './reexports-deep';
-export {v};
+export { v } from "./reexports-deep";
diff --git a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/rspack.config.js b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/rspack.config.js
index f75570bd83a..93f66ea6acc 100644
--- a/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/rspack.config.js
+++ b/packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/rspack.config.js
@@ -3,5 +3,10 @@ module.exports = {
 	optimization: {
 		sideEffects: true,
 		providedExports: true,
+	},
+	experiments: {
+		rspackFuture: {
+			newIncremental: true
+		}
 	}
 };