diff --git a/src/rendering.ts b/src/rendering.ts
index 17d8d93..71353fe 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -578,8 +578,14 @@ export class StatusmapRenderer {
     if (this.panel.color.mode === 'opacity') {
       return this.panel.color.cardColor;
     } else if (this.panel.color.mode === 'spectrum') {
-      return this.colorScale(bucket.value);
-    } else if (this.panel.color.mode === 'discrete') {
+      if(bucket.value !== null) {
+        return this.colorScale(bucket.value);
+      } else {
+          if(this.panel.nullPointMode == 'as zero')  {
+            return this.colorScale(0);
+          }
+        }
+      } else if (this.panel.color.mode === 'discrete') {
       if (this.panel.seriesFilterIndex !== null && this.panel.seriesFilterIndex !== -1) {
         return this.ctrl.discreteExtraSeries.getBucketColorSingle(bucket.values[this.panel.seriesFilterIndex]);
       } else {