diff --git a/server/models/index.js b/server/models/index.js
index 841616b..ec5b4d0 100644
--- a/server/models/index.js
+++ b/server/models/index.js
@@ -5,12 +5,22 @@ if (process.env.NODE_ENV !== 'test') {
   require('dotenv').config();
 }
 
-// Check if models are already initialized (for tests)
-if (global.__TEST_MODELS__) {
-  console.log(`🔧 DEBUG: Using global test models from models/index.js`);
-  module.exports = global.__TEST_MODELS__;
-} else {
-  console.log(`🔧 DEBUG: Creating new models instance in models/index.js`);
+// Function to get current models (checks global models each time)
+function getCurrentModels() {
+  if (process.env.NODE_ENV === 'test' && global.__TEST_MODELS__) {
+    console.log(`🔧 DEBUG: Using global test models from models/index.js`);
+    return global.__TEST_MODELS__;
+  }
+  
+  // If no global models, use the default cached models
+  if (!module.exports._defaultModels) {
+    console.log(`🔧 DEBUG: Creating new models instance in models/index.js`);
+    module.exports._defaultModels = createDefaultModels();
+  }
+  return module.exports._defaultModels;
+}
+
+function createDefaultModels() {
   // Configure database based on environment
   let sequelize;
   if (process.env.NODE_ENV === 'test') {