diff --git a/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx b/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx
index 902dc0034..af95e5eea 100644
--- a/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx
+++ b/frontend/app/components/Session_/Player/Controls/components/CreateNote.tsx
@@ -138,8 +138,10 @@ function CreateNote({
     label: name,
   })).toJS() as unknown as { value: string, label: string }[]
 
-  const changeChannel = ({ value, name }: { value: string; name: string }) => {
-    setChannel(value);
+  slackChannelsOptions.unshift({ value: null, label: 'Share to slack?' })
+
+  const changeChannel = ({ value, name }: { value: Record<string, string>; name: string }) => {
+    setChannel(value.value);
   };
 
   return (
@@ -210,7 +212,8 @@ function CreateNote({
         <div>
           <Select
             options={slackChannelsOptions}
-            defaultValue={"Share to Slack"}
+            // @ts-ignore
+            defaultValue
             // @ts-ignore
             onChange={changeChannel}
             className="mr-4"
diff --git a/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx b/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx
index cce645faf..548e94f42 100644
--- a/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/Notes/NoteItem.tsx
@@ -66,7 +66,7 @@ function NoteItem(props: Props) {
                   width: 50,
                   fontSize: 11,
                 }}
-                className="rounded-full px-2 py-1 mr-2 text-white flex items-center justify-center"
+                className="rounded-full px-2 py-1 text-white flex items-center justify-center"
               >
                 {props.note.tag}
               </div>
diff --git a/frontend/app/components/shared/SessionListContainer/components/Notes/TeamBadge.tsx b/frontend/app/components/shared/SessionListContainer/components/Notes/TeamBadge.tsx
index c589305dc..19e507efa 100644
--- a/frontend/app/components/shared/SessionListContainer/components/Notes/TeamBadge.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/Notes/TeamBadge.tsx
@@ -3,9 +3,9 @@ import { Icon } from 'UI'
 
 export default function TeamBadge() {
   return (
-    <>
-      <Icon name="user-friends" className="ml-2 mr-1" color="gray-dark" />
+    <div className="flex items-center ml-2">
+      <Icon name="user-friends" className="mr-1" color="gray-dark" />
       <span className="text-disabled-text">Team</span>
-    </>
+    </div>
   )
 }