diff --git a/src/views/studio/studio-comments.jsx b/src/views/studio/studio-comments.jsx
index 1c33a04e0..e2ea3cf55 100644
--- a/src/views/studio/studio-comments.jsx
+++ b/src/views/studio/studio-comments.jsx
@@ -75,7 +75,7 @@ const StudioComments = ({
                 <h2><FormattedMessage id="studio.commentsHeader" /></h2>
                 {canEditCommentsAllowed && <StudioCommentsAllowed />}
             </div>
-            {studioCommentsGloballyEnabled ?
+            {!hasFetchedSession || studioCommentsGloballyEnabled ?
                 <div>
                     {shouldShowCommentComposer ?
                         (commentsAllowed ?
diff --git a/test/unit/components/studio-comments.test.jsx b/test/unit/components/studio-comments.test.jsx
index 1985d370f..fb8f13757 100644
--- a/test/unit/components/studio-comments.test.jsx
+++ b/test/unit/components/studio-comments.test.jsx
@@ -69,4 +69,45 @@ describe('Studio comments', () => {
         );
         expect(resetComments).not.toHaveBeenCalled();
     });
+
+    test('Comments do not show when they are off globally', () => {
+        const component = mountWithIntl(
+            <StudioComments
+                hasFetchedSession
+                isAdmin={false}
+                comments={[{id: 123, author: {}}]}
+                studioCommentsGloballyEnabled={false}
+            />
+        );
+        expect(component.find('div.studio-compose-container').exists()).toBe(true);
+        expect(component.find('CommentingStatus').exists()).toBe(true);
+        expect(component.find('TopLevelComment').exists()).toBe(false);
+    });
+    test('Comments do show when they are on globally', () => {
+        const component = mountWithIntl(
+            <StudioComments
+                hasFetchedSession
+                isAdmin={false}
+                comments={[{id: 123, author: {}}]}
+                studioCommentsGloballyEnabled
+            />
+        );
+        expect(component.find('div.studio-compose-container').exists()).toBe(true);
+        expect(component.find('CommentingStatus').exists()).toBe(false);
+        expect(component.find('TopLevelComment').exists()).toBe(true);
+    });
+
+    test('Comments off status does not show if we have not fetched the session', () => {
+        const component = mountWithIntl(
+            <StudioComments
+                hasFetchedSession={false}
+                isAdmin={false}
+                comments={[{id: 123, author: {}}]}
+                studioCommentsGloballyEnabled={false}
+            />
+        );
+        expect(component.find('div.studio-compose-container').exists()).toBe(true);
+        expect(component.find('CommentingStatus').exists()).toBe(false);
+        expect(component.find('TopLevelComment').exists()).toBe(true);
+    });
 });