diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index 59193447fbc9f..2269b226cf01d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -342,7 +342,7 @@ protected void internalDeleteNamespace(AsyncResponse asyncResponse, boolean auth
                     NamespaceBundles bundles = pulsar().getNamespaceService().getNamespaceBundleFactory()
                                     .getBundles(namespaceName);
                     for (NamespaceBundle bundle : bundles.getBundles()) {
-                                // check if the bundle is owned by any broker, if not then we do not need to delete the bundle
+                        // check if the bundle is owned by any broker, if not then we do not need to delete the bundle
                         deleteBundleFutures.add(pulsar().getNamespaceService().getOwnerAsync(bundle)
                                 .thenCompose(ownership -> {
                                     if (ownership.isPresent()) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index e41d290530171..58bba282d0baf 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -1178,10 +1178,11 @@ private CompletableFuture<Void> delete(boolean failIfHasSubscriptions,
                 return null;
             });
 
-                closeClientFuture.thenAccept(__ -> {
+                closeClientFuture.thenAccept(delete -> {
                     CompletableFuture<Void> deleteTopicAuthenticationFuture = new CompletableFuture<>();
                     brokerService.deleteTopicAuthenticationWithRetry(topic, deleteTopicAuthenticationFuture, 5);
-                    deleteTopicAuthenticationFuture.thenCompose(ignore -> deleteSchema())
+                    deleteTopicAuthenticationFuture.thenCompose(__ -> deleteSchema ? deleteSchema() :
+                                    CompletableFuture.completedFuture(null))
                             .thenCompose(ignore -> {
                                 if (!EventsTopicNames.isTopicPoliciesSystemTopic(topic)) {
                                     return deleteTopicPolicies();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
index 89cc626b262a0..e479519f39312 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
@@ -86,13 +86,11 @@
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.Schema;
-import org.apache.pulsar.client.api.SubscriptionInitialPosition;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.client.impl.ConnectionPool;
 import org.apache.pulsar.client.impl.PulsarServiceNameResolver;
 import org.apache.pulsar.client.impl.auth.AuthenticationTls;
 import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
-import org.apache.pulsar.common.events.EventsTopicNames;
 import org.apache.pulsar.common.naming.NamespaceBundle;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicName;