diff --git a/opm/material/common/EnsureFinalized.hpp b/opm/material/common/EnsureFinalized.hpp
index e9d17f2fb..53eb7b048 100644
--- a/opm/material/common/EnsureFinalized.hpp
+++ b/opm/material/common/EnsureFinalized.hpp
@@ -31,9 +31,10 @@
 #include <stdexcept>
 
 // TODO: move this variable to config.h
-#define OPM_CHECK_PARAM_FINALIZED 1
+//#define OPM_CHECK_PARAM_FINALIZED 0
+#define USE_OPM_CHECK_PARAM_FINALIZED 0
 
-#if ! defined(NDEBUG) && OPM_CHECK_PARAM_FINALIZED
+#ifndef NDEBUG
 #define USE_OPM_CHECK_PARAM_FINALIZED 1
 #endif