diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h
index 58c95ccb6..a508b4ba3 100644
--- a/src/blackgui/models/columnformatters.h
+++ b/src/blackgui/models/columnformatters.h
@@ -352,7 +352,11 @@ namespace BlackGui
             //! Version if value is already available as PQ
             BlackMisc::CVariant displayRole(const PQ &pq) const
             {
-                if (m_unit.isNull()) { return pq.valueRoundedWithUnit(m_digits, m_useI18n); }
+                if (pq.isNull())
+                {
+                    static const BlackMisc::CVariant null("null");
+                    return null;
+                }
                 return pq.valueRoundedWithUnit(m_unit, m_digits, m_useI18n);
             }