diff --git a/turbonfs/src/config.cpp b/turbonfs/src/config.cpp
index ca84a1b8..899b1a06 100644
--- a/turbonfs/src/config.cpp
+++ b/turbonfs/src/config.cpp
@@ -437,8 +437,8 @@ bool aznfsc_cfg::set_defaults_and_sanitize()
         ::freeaddrinfo(ai);
     }
 
-    if (xprtsec == nullptr)
-        xprtsec = ::strdup("none");
+    // Set xprtsec to none for now, by default. 
+    xprtsec = ::strdup("none");
 
     assert(account != nullptr);
     assert(container != nullptr);
diff --git a/turbonfs/src/main.cpp b/turbonfs/src/main.cpp
index e5d7fb28..bfedd236 100644
--- a/turbonfs/src/main.cpp
+++ b/turbonfs/src/main.cpp
@@ -832,13 +832,15 @@ int main(int argc, char *argv[])
         goto err_out4;
     }
 
-    if (aznfsc_cfg.auth) {
+    // Disable AAD based auth for now. We will enable this when we support auth with TLS.
+   /* if (aznfsc_cfg.auth) {
         // Set the auth token callback for this connection if auth is enabled.
         set_auth_token_callback(get_auth_token_and_setargs_cb);
     } else {
         set_auth_token_callback(get_auth_token_and_setargs_cb_none);
-    }
-
+    }*/
+    set_auth_token_callback(get_auth_token_and_setargs_cb_none);
+	
     /*
      * Initialize nfs_client singleton.
      * This creates the libnfs polling thread(s) and hence it MUST be called