diff --git a/backend/__init__.py b/backend/__init__.py
index 482bcba..89b1690 100644
--- a/backend/__init__.py
+++ b/backend/__init__.py
@@ -97,6 +97,8 @@ def get_me(sid, room):
                 sio.get_session(sid).game = de_games[0]
                 sio.enter_room(sid, de_games[0].name)
                 de_games[0].notify_room(sid)
+                de_games[0].notify_event_card(sid)
+                de_games[0].notify_scrap_pile(sid)
                 de_games[0].notify_all()
             de_games[0].notify_event_card()
         else:
diff --git a/backend/bang/game.py b/backend/bang/game.py
index 0bebcb1..b5dbbcf 100644
--- a/backend/bang/game.py
+++ b/backend/bang/game.py
@@ -399,19 +399,21 @@ class Game:
                 self.turn = (self.turn + 1) % len(self.players)
             self.play_turn()
 
-    def notify_event_card(self):
+    def notify_event_card(self, sid=None):
         if len(self.deck.event_cards) > 0:
+            room = self.name if sid == None else sid
             if self.deck.event_cards[0] != None:
-                self.sio.emit('event_card', room=self.name, data=self.deck.event_cards[0].__dict__)
+                self.sio.emit('event_card', room=room, data=self.deck.event_cards[0].__dict__)
             else:
-                self.sio.emit('event_card', room=self.name, data=None)
+                self.sio.emit('event_card', room=room, data=None)
 
-    def notify_scrap_pile(self):
+    def notify_scrap_pile(self, sid=None):
         print('scrap')
+        room = self.name if sid == None else sid
         if self.deck.peek_scrap_pile():
-            self.sio.emit('scrap', room=self.name, data=self.deck.peek_scrap_pile().__dict__)
+            self.sio.emit('scrap', room=room, data=self.deck.peek_scrap_pile().__dict__)
         else:
-            self.sio.emit('scrap', room=self.name, data=None)
+            self.sio.emit('scrap', room=room, data=None)
 
     def handle_disconnect(self, player: pl.Player):
         print(f'player {player.name} left the game {self.name}')
diff --git a/frontend/src/components/Deck.vue b/frontend/src/components/Deck.vue
index a8dbfdb..8722760 100644
--- a/frontend/src/components/Deck.vue
+++ b/frontend/src/components/Deck.vue
@@ -85,6 +85,7 @@ export default {
 			return classes
 		},
 		eventDesc() {
+			this.eventCard;
 			if (this.eventCard.name !== 'PewPew!'){
 				return this.$t(`cards.${this.eventCard.name}.desc`)
 			}
diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue
index 8ff0b0d..d1b25d2 100644
--- a/frontend/src/components/Player.vue
+++ b/frontend/src/components/Player.vue
@@ -56,7 +56,7 @@
 		<Chooser v-if="holydayScrap && scrapHand.length < 2" :text="`${$t('discard')} ${2 - scrapHand.length}`"
 							:cards="notScrappedHand" :select="holydayScrapAdd" :cancel="() => {holydayScrap = false;scrapHand=[]}"/>
 		<Chooser v-if="holydayScrap && scrapHand.length == 2" :text="$t('card_against')" :cards="visiblePlayers" :select="holydayScrapBang" :cancel="() => {holydayScrap = false;scrapHand=[]}"/>
-		<Chooser style="filter: grayscale(1);" v-if="emporioCards && emporioCards.cards && emporioCards.cards.length > 0 && pending_action === 4" :text="$t('emporio_others', [emporioCards.name])" :cards="emporioCards.cards"/>
+		<Chooser style="filter: grayscale(1);" v-if="emporioCards && emporioCards.cards && emporioCards.cards.length > 0 && (pending_action === 4 || pending_action === null)" :text="$t('emporio_others', [emporioCards.name])" :cards="emporioCards.cards"/>
 	</div>
 </template>