diff --git a/lib/Standard_ProxySQL_Admin.cpp b/lib/Standard_ProxySQL_Admin.cpp
index 7f88537f3..2a4f2811b 100644
--- a/lib/Standard_ProxySQL_Admin.cpp
+++ b/lib/Standard_ProxySQL_Admin.cpp
@@ -199,10 +199,12 @@ void admin_session_handler(MySQL_Session *sess, ProxySQL_Admin *pa, PtrSize_t *p
 	if (query_no_space_length==strlen("PROXYSQL START") && !strncasecmp("PROXYSQL START",query_no_space, query_no_space_length)) {
 		run_query=false;
 		Standard_ProxySQL_Admin *SPA=(Standard_ProxySQL_Admin *)pa;
-		bool rc;
-		rc=__sync_bool_compare_and_swap(&GloVars.global.nostart,1,0);
+		bool rc=false;
+		if (nostart_) {
+			rc=__sync_bool_compare_and_swap(&GloVars.global.nostart,1,0);
+		}
 		if (rc) {
-			nostart_=false;
+			//nostart_=false;
 			SPA->send_MySQL_OK(&sess->myprot_client, NULL);
 		} else {
 			SPA->send_MySQL_ERR(&sess->myprot_client, (char *)"ProxySQL already started");
diff --git a/src/main.cpp b/src/main.cpp
index 35dd23bb7..0e88250dc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -562,7 +562,8 @@ int main(int argc, const char * argv[]) {
 	GloAdmin->init_users();
 
 
-	if (GloVars.__cmd_proxysql_nostart) {
+	//if (GloVars.__cmd_proxysql_nostart) {
+	if (GloVars.global.nostart) {
 		pthread_mutex_lock(&GloVars.global.start_mutex);
 	}