diff --git a/CMakeLists.txt b/CMakeLists.txt
index 468bb4741..61cf9b1c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,8 +169,12 @@ if(ZLIB_FOUND)
 endif()
 if(SQLITE3_FOUND)
 	include_directories(${SQLITE3_INCLUDE_DIRS})
-	add_definitions("-DMSG_STORAGE_ENABLED")
-	add_definitions("-DCALL_LOGS_STORAGE_ENABLED")
+	if(ENABLE_MSG_STORAGE)
+		add_definitions("-DMSG_STORAGE_ENABLED")
+	endif()
+	if(ENABLE_CALL_LOGS_STORAGE)
+		add_definitions("-DCALL_LOGS_STORAGE_ENABLED")
+	endif()
 endif()
 if(INTL_FOUND)
 	set(HAVE_INTL 1)