diff --git a/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/PreparedStatementClassDataProvider.java b/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/PreparedStatementClassDataProvider.java
index 430c0c713b8..bbdcdbb9b43 100644
--- a/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/PreparedStatementClassDataProvider.java
+++ b/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/PreparedStatementClassDataProvider.java
@@ -44,6 +44,7 @@ public void add() {
         try {
             ClassVisitorFactory factory = classFactoryForDerbyDB();
             doAdd(factory, "org/apache/derby/client/am/PreparedStatement");
+            doAdd(factory, "org/apache/derby/client/am/ClientPreparedStatement");
 
             factory = classFactoryForHSQLDB();
             doAdd(factory, "org/hsqldb/jdbc/JDBCPreparedStatement");
diff --git a/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/StatementClassDataDataProvider.java b/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/StatementClassDataDataProvider.java
index 076e033b4c0..d7ed9891d3c 100644
--- a/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/StatementClassDataDataProvider.java
+++ b/agent/src/main/java/com/microsoft/applicationinsights/agent/internal/agent/sql/StatementClassDataDataProvider.java
@@ -41,6 +41,7 @@ public class StatementClassDataDataProvider {
             "oracle/jdbc/driver/OracleStatement",
             "com/microsoft/sqlserver/jdbc/SQLServerStatement",
             "org/apache/derby/client/am/Statement",
+            "org/apache/derby/client/am/ClientStatement",
             "org/sqlite/jdbc3/JDBC3Statement"
     };