diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt
index cf3815f6..90cc5a8e 100644
--- a/server/gameserver/CMakeLists.txt
+++ b/server/gameserver/CMakeLists.txt
@@ -16,6 +16,7 @@ message(LIB_DIR: ${LIB_DIR} )
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEWBIE_ROOM=1")
 if (${ASAN})
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEWBIE_ROOM=1 -fsanitize=address -fno-omit-frame-pointer")
   set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEWBIE_ROOM=1 -fsanitize=address -fno-omit-frame-pointer")
 else()
   set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEWBIE_ROOM=1")
@@ -135,9 +136,17 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     behaviac_gcc_debug
     )
 else()
+  if (${ASAN})
+    target_link_libraries(
+      gameserver${GAME_ID}
+      #tcmalloc
+      behaviac_gcc_release
+      )
+  else()
   target_link_libraries(
-    gameserver${GAME_ID}
-    tcmalloc
-    behaviac_gcc_release
-    )
+      gameserver${GAME_ID}
+      tcmalloc
+      behaviac_gcc_release
+      )
+    endif()
 endif()