diff --git a/components/dashboard/src/Menu.tsx b/components/dashboard/src/Menu.tsx
index 6e45ef2ce9b9c3..ad8748a8ed7855 100644
--- a/components/dashboard/src/Menu.tsx
+++ b/components/dashboard/src/Menu.tsx
@@ -27,6 +27,7 @@ import { getProjectSettingsMenu } from "./projects/ProjectSettings";
 import { ProjectContext } from "./projects/project-context";
 import { PaymentContext } from "./payment-context";
 import FeedbackFormModal from "./feedback-form/FeedbackModal";
+import { isGitpodIo } from "./utils";
 
 interface Entry {
     title: string;
@@ -376,9 +377,11 @@ export default function Menu() {
                                             />
                                         </li>
                                     ))}
-                                <li className="cursor-pointer">
-                                    <PillMenuItem name="Feedback" onClick={handleFeedbackFormClick} />
-                                </li>
+                                {isGitpodIo() && (
+                                    <li className="cursor-pointer">
+                                        <PillMenuItem name="Feedback" onClick={handleFeedbackFormClick} />
+                                    </li>
+                                )}
                             </ul>
                         </nav>
                         <div
diff --git a/components/dashboard/src/components/ErrorMessage.tsx b/components/dashboard/src/components/ErrorMessage.tsx
index efbfdff2116b6d..2d4cac289f37a5 100644
--- a/components/dashboard/src/components/ErrorMessage.tsx
+++ b/components/dashboard/src/components/ErrorMessage.tsx
@@ -5,6 +5,7 @@
  */
 
 import FeedbackComponent from "../feedback-form/FeedbackComponent";
+import { isGitpodIo } from "../utils";
 
 function ErrorMessage(props: { imgSrc: string; imgAlt?: string; message: string }) {
     return (
@@ -17,12 +18,14 @@ function ErrorMessage(props: { imgSrc: string; imgAlt?: string; message: string
                     <p className="text-gitpod-red text-sm">{props.message}</p>
                 </div>
             </div>
-            <FeedbackComponent
-                message={"Was this error message helpful?"}
-                initialSize={24}
-                isError={true}
-                isModal={false}
-            />
+            {isGitpodIo() && (
+                <FeedbackComponent
+                    message={"Was this error message helpful?"}
+                    initialSize={24}
+                    isError={true}
+                    isModal={false}
+                />
+            )}
         </>
     );
 }
diff --git a/components/dashboard/src/start/CreateWorkspace.tsx b/components/dashboard/src/start/CreateWorkspace.tsx
index 9a331c8caefd40..63bcac75a0c4a0 100644
--- a/components/dashboard/src/start/CreateWorkspace.tsx
+++ b/components/dashboard/src/start/CreateWorkspace.tsx
@@ -24,6 +24,7 @@ import { SelectAccountModal } from "../settings/SelectAccountModal";
 import { watchHeadlessLogs } from "../components/PrebuildLogs";
 import CodeText from "../components/CodeText";
 import FeedbackComponent from "../feedback-form/FeedbackComponent";
+import { isGitpodIo } from "../utils";
 
 const WorkspaceLogs = React.lazy(() => import("../components/WorkspaceLogs"));
 
@@ -433,7 +434,7 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
                 <CodeText>{repoFullName}</CodeText>
             </p>
             {statusMessage}
-            {p.error && (
+            {p.error && isGitpodIo() && (
                 <FeedbackComponent
                     isModal={false}
                     message={"Was this error message helpful?"}