diff --git a/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java b/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
index d13ca225a4ee..b0e4ba5af758 100644
--- a/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
+++ b/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
@@ -950,8 +950,8 @@ private static Set<String> sslConfigNames() {
     return sslConfig.names();
   }
 
-  public String getServiceId() {
+  public static String getServiceId(KsqlConfig ksqlConfig) {
     return ReservedInternalTopics.KSQL_INTERNAL_TOPIC_PREFIX
-        + this.getString(KsqlConfig.KSQL_SERVICE_ID_CONFIG);
+        + ksqlConfig.getString(KsqlConfig.KSQL_SERVICE_ID_CONFIG);
   }
 }
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/query/QueryExecutor.java b/ksqldb-engine/src/main/java/io/confluent/ksql/query/QueryExecutor.java
index 327de8198fc0..d75c18211d44 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/query/QueryExecutor.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/query/QueryExecutor.java
@@ -162,7 +162,7 @@ public TransientQueryMetadata buildTransientQuery(
     final BlockingRowQueue queue = buildTransientQueryQueue(queryId, physicalPlan, limit);
 
     final String applicationId = addTimeSuffix(getQueryApplicationId(
-        ksqlConfig.getServiceId(),
+        KsqlConfig.getServiceId(ksqlConfig),
         ksqlConfig.getString(KsqlConfig.KSQL_TRANSIENT_QUERY_NAME_PREFIX_CONFIG),
         queryId
     ));
@@ -209,7 +209,7 @@ public PersistentQueryMetadata buildQuery(
     final String persistenceQueryPrefix =
         ksqlConfig.getString(KsqlConfig.KSQL_PERSISTENT_QUERY_NAME_PREFIX_CONFIG);
     final String applicationId = getQueryApplicationId(
-        ksqlConfig.getServiceId(),
+        KsqlConfig.getServiceId(ksqlConfig),
         persistenceQueryPrefix,
         queryId
     );
diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/ListSourceExecutor.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/ListSourceExecutor.java
index 882145077349..bd040b730509 100644
--- a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/ListSourceExecutor.java
+++ b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/ListSourceExecutor.java
@@ -228,7 +228,7 @@ private static SourceDescriptionWithWarnings describeSource(
           final String persistenceQueryPrefix =
               ksqlConfig.getString(KsqlConfig.KSQL_PERSISTENT_QUERY_NAME_PREFIX_CONFIG);
           final String applicationId = getQueryApplicationId(
-              ksqlConfig.getServiceId(),
+              KsqlConfig.getServiceId(ksqlConfig),
               persistenceQueryPrefix,
               queryId
           );