diff --git a/Makefile b/Makefile
index e2fae373d..fd6e78bc8 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ ifeq ($(CAFFE_MLSL_SHUFFLE), 1)
 	COMMON_FLAGS += -DCAFFE_MLSL_SHUFFLE
 endif
 
-ifneq ($(FW_OVERLAP_OPT), 0)
+ifeq ($(FW_OVERLAP_OPT), 1)
 	COMMON_FLAGS += -DFW_OVERLAP_OPT
 endif
 endif
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index b8c5577c6..67adf4ba7 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -122,7 +122,7 @@ if(USE_MLSL)
   if(CAFFE_MLSL_SHUFFLE)
     add_definitions("-DCAFFE_MLSL_SHUFFLE")
   endif()
-  if(FW_OVERLAP_OPT OR NOT DEFINED FW_OVERLAP_OPT)
+  if(FW_OVERLAP_OPT)
     message(STATUS "Forward overlapping optimization is enabled!")
     add_definitions("-DFW_OVERLAP_OPT")
   endif()