diff --git a/lib/msf/core/module.rb b/lib/msf/core/module.rb
index 239753f28a..098f06462b 100644
--- a/lib/msf/core/module.rb
+++ b/lib/msf/core/module.rb
@@ -165,7 +165,7 @@ class Module
 		obj.datastore    = self.datastore.copy
 		obj.user_input   = self.user_input
 		obj.user_output  = self.user_output
-		obj.module_store = self.module_store
+		obj.module_store = self.module_store.clone
 		obj
 	end