diff --git a/src/locales/en.json b/src/locales/en.json
index 52e522fe..3b14cfc4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -157,6 +157,7 @@
 	},
 	"Heightmap": {
 		"Heightmap": "Heightmap",
+		"ErrorKlipperNotReady": "Klipper not ready. Heightmap disabled.",
 		"NoProfile": "No profile available",
 		"TitleHomeAll": "Home all",
 		"Clear": "clear",
diff --git a/src/pages/Heightmap.vue b/src/pages/Heightmap.vue
index 52d91fbe..e51b78b2 100644
--- a/src/pages/Heightmap.vue
+++ b/src/pages/Heightmap.vue
@@ -4,7 +4,7 @@
 
 <template>
     <div>
-        <v-row>
+        <v-row v-if="klipperReadyForGui">
             <v-col class="col-12 col-md-8">
                 <v-card>
                     <v-toolbar flat dense>
@@ -119,6 +119,17 @@
                 </v-card>
             </v-col>
         </v-row>
+        <v-row v-else>
+            <v-alert
+                border="left"
+                colored-border
+                type="warning"
+                elevation="2"
+                class="mx-auto mt-6"
+                max-width="500"
+                icon="mdi-lock-outline"
+            >{{ $t('Heightmap.ErrorKlipperNotReady') }}</v-alert>
+        </v-row>
         <v-dialog v-model="renameDialog" persistent max-width="600px">
             <v-card>
                 <v-card-title>