diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a9393c4fa..6a080b9b3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,12 +121,14 @@ else()
     message(FATAL_ERROR "Aub Stream headers not available!")
 endif()
 
-if(NOT DEFINED AUB_STREAM_DIR)
+if(NOT DEFINED AUB_STREAM_DIR AND NOT DISABLE_AUB_STREAM)
     get_filename_component(TEMP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream/aub_mem_dump" ABSOLUTE)
     if(IS_DIRECTORY ${TEMP_DIR})
         set(AUB_STREAM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream")
         message(STATUS "Aub Stream dir: ${AUB_STREAM_DIR}")
     endif()
+else()
+    unset(AUB_STREAM_DIR)
 endif(NOT DEFINED AUB_STREAM_DIR)
 
 if(LIBDRM_DIR)