diff --git a/driver/others/blas_server.c b/driver/others/blas_server.c
index 3d89803a60..67ecb2c29b 100644
--- a/driver/others/blas_server.c
+++ b/driver/others/blas_server.c
@@ -146,8 +146,8 @@ typedef struct {
 } thread_status_t;
 
 #ifdef HAVE_C11
-#define	atomic_load_queue(p)		__atomic_load_n(p, __ATOMIC_ACQUIRE)
-#define	atomic_store_queue(p, v)	__atomic_store_n(p, v, __ATOMIC_RELEASE)
+#define	atomic_load_queue(p)		__atomic_load_n(p, __ATOMIC_RELAXED)
+#define	atomic_store_queue(p, v)	__atomic_store_n(p, v, __ATOMIC_RELAXED)
 #else
 #define	atomic_load_queue(p)		(blas_queue_t*)(*(volatile blas_queue_t**)(p))
 #define	atomic_store_queue(p, v)	(*(volatile blas_queue_t* volatile*)(p) = (v))
@@ -984,8 +984,6 @@ int BLASFUNC(blas_thread_shutdown)(void){
 
   int i;
 
-  LOCK_COMMAND(&server_lock);
-
   //Free buffers allocated for threads
   for(i=0; i<MAX_CPU_NUMBER; i++){
     if(blas_thread_buffer[i]!=NULL){
@@ -1025,7 +1023,6 @@ int BLASFUNC(blas_thread_shutdown)(void){
     blas_server_avail = 0;
 
   }
-  UNLOCK_COMMAND(&server_lock);
 
   return 0;
 }