diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
index 3f2bbcacb..e41e40735 100644
--- a/uppsrc/Core/Defs.h
+++ b/uppsrc/Core/Defs.h
@@ -34,8 +34,12 @@ void    PanicMessageBox(const char *title, const char *text);
 
 #else
 
-#define ASSERT_(x, msg)
-#define ASSERT(x)
+inline  void LOGNOP__() {}
+
+#define LOG_NOP          Upp::LOGNOP__()
+
+#define ASSERT_(x, msg)  LOG_NOP
+#define ASSERT(x)        LOG_NOP
 
 #endif
 
diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h
index d857e51e5..e28cc215c 100644
--- a/uppsrc/Core/Diag.h
+++ b/uppsrc/Core/Diag.h
@@ -129,18 +129,12 @@ inline void UnlockLog() {}
 
 #else
 
-inline  void LOGNOP__() {}
-
-#define LOG_NOP          Upp::LOGNOP__()
-
 #define DLOG(x)          @ // To clean logs after debugging, this produces error in release mode
 #define DDUMP(x)         @
 #define DDUMPC(x)        @
 #define DDUMPM(x)        @
 #define DTIMING(x)       @
 
-#define ASSERT(x)        LOG_NOP
-
 #define DEBUGCODE(x)     LOG_NOP
 
 inline void LOGF(const char *format, ...) {}