diff --git a/DESCRIPTION b/DESCRIPTION
index 48393c3..584b99c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RcppThread
 Title: R-Friendly Threading in C++
-Version: 2.1.7
+Version: 2.1.8
 Authors@R: c(
     person("Thomas", "Nagler",, "mail@tnagler.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1855-0046"))
diff --git a/NEWS.md b/NEWS.md
index 56c295b..57ba9f7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,9 @@
+# RcppThread 2.1.8
+
+BUG FIX
+
+* Fixed compilation warning about R_NO_REMAP being defined multiple times (thanks @tylermorganwall)
+
 # RcppThread 2.1.7
 
 BUG FIX
diff --git a/inst/include/RcppThread/RMonitor.hpp b/inst/include/RcppThread/RMonitor.hpp
index 00e1357..6b2a4fe 100644
--- a/inst/include/RcppThread/RMonitor.hpp
+++ b/inst/include/RcppThread/RMonitor.hpp
@@ -7,7 +7,9 @@
 #pragma once
 
 // R API
+#ifndef R_NO_REMAP
 #define R_NO_REMAP
+#endif
 #include "Rinternals.h"
 #include "R.h"
 
diff --git a/src/detectCores.cpp b/src/detectCores.cpp
index 52787fc..b23a61d 100644
--- a/src/detectCores.cpp
+++ b/src/detectCores.cpp
@@ -1,6 +1,8 @@
 #include <thread>
 
+#ifndef R_NO_REMAP
 #define R_NO_REMAP
+#endif
 
 #include <R.h>
 #include <Rdefines.h>