diff --git a/components/Dashboard/TeamVoiceLine.tsx b/components/Dashboard/TeamVoiceLine.tsx
index 2dbfa1a..0f0d905 100644
--- a/components/Dashboard/TeamVoiceLine.tsx
+++ b/components/Dashboard/TeamVoiceLine.tsx
@@ -205,6 +205,11 @@ export default function TeamVoiceLine() {
                   <span className="text-sm text-white font-bold">
                     {tmember.nickName}
                   </span>
+
+                  <span className="text-white shadow-xl font-bold  px-3 py-1 rounded">
+                    {/* keyboard shortcuts start from 1 */}
+                    {i + 1}
+                  </span>
                 </span>
 
                 <span className={"text-xs span-sans text-gray-300"}>
diff --git a/contexts/audioContext.tsx b/contexts/audioContext.tsx
index b01dc6e..51abc9f 100644
--- a/contexts/audioContext.tsx
+++ b/contexts/audioContext.tsx
@@ -223,13 +223,15 @@ export default function AudioContextProvider({ children }) {
     console.log(selectedTeammate);
 
     // recording
-    if (event.keyCode == KeyCode.R && selectedTeammate) {
+    if (event.keyCode == KeyCode.R) {
       if (!audioInputDeviceId) {
         toast.error("No microphone selected");
       } else if (!hasRecPermit) {
         toast.error("You did not allow recording permission!");
       } else if (isMuted) {
-        toast.error("You are muted, sorry!");
+        toast.error("You are muted!");
+      } else if (!selectedTeammate) {
+        toast.error("Please select a team member or announcements first");
       } else {
         console.log("started recording");
         setIsRecording(true);