diff --git a/app/Http/Controllers/Rd/CmSongController.php b/app/Http/Controllers/Rd/CmSongController.php
index 6c5bb335..99045b43 100644
--- a/app/Http/Controllers/Rd/CmSongController.php
+++ b/app/Http/Controllers/Rd/CmSongController.php
@@ -202,7 +202,8 @@ public function store(Request $request): JsonResponse
             'audio_mime_type' => 'nullable|string',
         ]);
 
-        $user = Auth::user();
+        $tenantId = session('selected_tenant_id', 1);
+        $userId = Auth::id();
         $audioPath = null;
 
         // 오디오 데이터가 있으면 WAV 파일로 저장
@@ -219,15 +220,15 @@ public function store(Request $request): JsonResponse
             }
 
             $filename = 'cm-song-'.date('Ymd-His').'-'.uniqid().'.wav';
-            $dir = "cm-songs/{$user->tenant_id}";
+            $dir = "cm-songs/{$tenantId}";
             Storage::disk('tenant')->makeDirectory($dir);
             Storage::disk('tenant')->put("{$dir}/{$filename}", $audioBytes);
             $audioPath = "{$dir}/{$filename}";
         }
 
         $song = CmSong::create([
-            'tenant_id' => $user->tenant_id,
-            'user_id' => $user->id,
+            'tenant_id' => $tenantId,
+            'user_id' => $userId,
             'company_name' => $request->company_name,
             'industry' => $request->industry,
             'lyrics' => $request->lyrics,