diff --git a/src/main/java/com/emc/rest/smart/SmartClientFactory.java b/src/main/java/com/emc/rest/smart/SmartClientFactory.java
index 7edeb19..31d7edb 100644
--- a/src/main/java/com/emc/rest/smart/SmartClientFactory.java
+++ b/src/main/java/com/emc/rest/smart/SmartClientFactory.java
@@ -147,7 +147,9 @@ static ApacheHttpClient4Handler createApacheClientHandler(SmartConfig smartConfi
         ClientConfig clientConfig = new DefaultClientConfig();
 
         // set up multi-threaded connection pool
-        org.apache.http.impl.conn.PoolingHttpClientConnectionManager connectionManager = new org.apache.http.impl.conn.PoolingHttpClientConnectionManager();
+        // TODO: find a non-deprecated connection manager that works (swapping out with
+        //       PoolingHttpClientConnectionManager will break threading)
+        org.apache.http.impl.conn.PoolingClientConnectionManager connectionManager = new org.apache.http.impl.conn.PoolingClientConnectionManager();
         // 999 maximum active connections (max allowed)
         connectionManager.setDefaultMaxPerRoute(999);
         connectionManager.setMaxTotal(999);