diff --git a/limelight-common/Limelight.h b/limelight-common/Limelight.h
index 7ce3e35..cb29163 100644
--- a/limelight-common/Limelight.h
+++ b/limelight-common/Limelight.h
@@ -8,6 +8,9 @@
 extern "C" {
 #endif
 
+// Enable this definition during debugging to enable assertions
+//#define LC_DEBUG
+
 typedef struct _STREAM_CONFIGURATION {
 	// Dimensions in pixels of the desired video stream
 	int width;
diff --git a/limelight-common/Platform.h b/limelight-common/Platform.h
index aa13a1c..7ff23de 100644
--- a/limelight-common/Platform.h
+++ b/limelight-common/Platform.h
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include "Limelight.h"
+
 #if defined(LC_WINDOWS)
 extern WCHAR DbgBuf[512];
 #define Limelog(s, ...) \
@@ -38,14 +39,22 @@ extern WCHAR DbgBuf[512];
 #endif
 
 #if defined(LC_WINDOWS)
-#include <crtdbg.h>
-#define LC_ASSERT(x) __analysis_assume(x); \
-                     _ASSERTE(x)
+ #include <crtdbg.h>
+ #ifdef LC_DEBUG
+  #define LC_ASSERT(x) __analysis_assume(x); \
+                       _ASSERTE(x)
+ #else
+  #define LC_ASSERT(x)
+ #endif
 #else
-#define LC_ASSERT(x)
+ #ifndef LC_DEBUG
+  #define NDEBUG
+ #endif
+ #include <assert.h>
+ #define LC_ASSERT(x) assert(x)
 #endif
 
 int initializePlatform(void);
 void cleanupPlatform(void);
 
-uint64_t PltGetMillis(void);
\ No newline at end of file
+uint64_t PltGetMillis(void);