diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index f08175825b..771eaa98d1 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -900,17 +900,17 @@ class ProtoService {
   }
 
   bool check_authenticated_() {
+#ifdef USE_API_PASSWORD
     if (!this->check_connection_setup_()) {
       return false;
     }
-#ifdef USE_API_PASSWORD
     if (!this->is_authenticated()) {
       this->on_unauthenticated_access();
       return false;
     }
     return true;
 #else
-    return true;
+    return this->check_connection_setup_();
 #endif
   }
 };