diff --git a/app/client/components/BehavioralPrompts.ts b/app/client/components/BehavioralPrompts.ts
index ca3c2d2f..a01f2ec1 100644
--- a/app/client/components/BehavioralPrompts.ts
+++ b/app/client/components/BehavioralPrompts.ts
@@ -3,6 +3,7 @@ import {AppModel} from 'app/client/models/AppModel';
 import {GristBehavioralPrompts} from 'app/client/ui/GristTooltips';
 import {isNarrowScreen} from 'app/client/ui2018/cssVars';
 import {BehavioralPrompt} from 'app/common/Prefs';
+import {getGristConfig} from 'app/common/urlUtils';
 import {Computed, Disposable, dom} from 'grainjs';
 import {IPopupOptions} from 'popweasel';
 
@@ -51,7 +52,18 @@ export class BehavioralPrompts extends Disposable {
   }
 
   private _queueTip(refElement: Element, prompt: BehavioralPrompt, options: AttachOptions) {
-    if (isNarrowScreen() || this._prefs.get().dontShowTips || this.hasSeenTip(prompt)) {
+    if (
+      // Don't show tips if surveying is disabled.
+      // TODO: Move this into a dedicated variable - this is only a short-term fix for hiding
+      // tips in grist-core.
+      !getGristConfig().survey ||
+      // Or on mobile - the design currently isn't mobile-friendly.
+      isNarrowScreen() ||
+      // Or if "Don't show tips" was checked in the past.
+      this._prefs.get().dontShowTips ||
+      // Or if this tip has been shown and dismissed in the past.
+      this.hasSeenTip(prompt)
+    ) {
       return;
     }
 
diff --git a/test/nbrowser/homeUtil.ts b/test/nbrowser/homeUtil.ts
index e71ee6ac..672fc550 100644
--- a/test/nbrowser/homeUtil.ts
+++ b/test/nbrowser/homeUtil.ts
@@ -439,7 +439,10 @@ export class HomeUtil {
   }
 
   private async _toggleTips(enabled: boolean, email: string) {
-    if (this.server.isExternalServer()) { throw new Error('not supported'); }
+    if (this.server.isExternalServer()) {
+      // Unsupported due to lack of access to the database.
+      return;
+    }
 
     const dbManager = await this.server.getDatabase();
     const user = await dbManager.getUserByLogin(email);