diff --git a/app/src/main/java/com/pfplaybackend/api/party/application/service/DjCommandService.java b/app/src/main/java/com/pfplaybackend/api/party/application/service/DjCommandService.java
index 7f585c1c..fa2aa39a 100644
--- a/app/src/main/java/com/pfplaybackend/api/party/application/service/DjCommandService.java
+++ b/app/src/main/java/com/pfplaybackend/api/party/application/service/DjCommandService.java
@@ -61,12 +61,14 @@ public Long enqueueDj(PartyroomId partyroomId, PlaylistId playlistId)  {
         DjData dj = DjData.create(partyroom.getPartyroomId(), playlistId, crewId, nextOrder);
         DjData saved = aggregatePort.saveDj(dj);
 
-        playbackState.activate(null, null);
-        aggregatePort.savePlaybackState(playbackState);
+        if (isPostActivationProcessingRequired) {
+            playbackState.activate(null, null);
+            aggregatePort.savePlaybackState(playbackState);
+        }
 
         eventPublisher.publishEvent(new DjQueueChangedEvent(partyroom.getPartyroomId(), DjChangeType.ENQUEUE, crewId));
 
-        if(isPostActivationProcessingRequired) {
+        if (isPostActivationProcessingRequired) {
             playbackControlPort.startPlayback(partyroom);
         }
         return saved.getId();
diff --git a/app/src/main/java/com/pfplaybackend/api/party/application/service/PartyroomQueryService.java b/app/src/main/java/com/pfplaybackend/api/party/application/service/PartyroomQueryService.java
index d5248eb0..e0475d16 100644
--- a/app/src/main/java/com/pfplaybackend/api/party/application/service/PartyroomQueryService.java
+++ b/app/src/main/java/com/pfplaybackend/api/party/application/service/PartyroomQueryService.java
@@ -166,7 +166,7 @@ public DjQueueInfoResult getDjQueueInfo(PartyroomId partyroomId) {
         QueueStatus queueStatus = djQueue.isClosed() ? QueueStatus.CLOSE : QueueStatus.OPEN;
         boolean isRegistered = isAlreadyRegistered(partyroom.getPartyroomId());
         PlaybackData playback = null;
-        if (isPlaybackActivated) {
+        if (isPlaybackActivated && playbackState.getCurrentPlaybackId() != null) {
             playback = playbackQueryService.getPlaybackById(playbackState.getCurrentPlaybackId());
         }
         List<DjWithProfileDto> djWithProfiles = getDjs(partyroom.getPartyroomId());