diff --git a/src/app/views/app-sections/FeedbackButton.tsx b/src/app/views/app-sections/FeedbackButton.tsx
index cc8e0e183c..0d0551c245 100644
--- a/src/app/views/app-sections/FeedbackButton.tsx
+++ b/src/app/views/app-sections/FeedbackButton.tsx
@@ -58,8 +58,8 @@ export const FeedbackButton = () => {
           />
         </TooltipHost>
 
-        <FeedbackForm onDismissSurvey={toggleSurvey}
-          activated={enableSurvey} onDisableSurvey={disableSurvey} />
+        {enableSurvey && <FeedbackForm onDismissSurvey={toggleSurvey}
+          activated={enableSurvey} onDisableSurvey={disableSurvey} />}
       </div>
       }
     </div>