diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
index b1b9a62de47..92472482334 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
@@ -119,7 +119,7 @@ public void close() throws IOException {}
     public CommitTable.Client getCommitTableClient() {
         return commitTableClient;
     }
-    
+
     @Override
     public PhoenixTransactionService getTransactionService(Configuration config, ConnectionInfo connectionInfo, int port) throws  SQLException{
         TSOServerConfig tsoConfig = new TSOServerConfig();
@@ -132,7 +132,8 @@ public PhoenixTransactionService getTransactionService(Configuration config, Con
 
         Injector injector = Guice.createInjector(new TSOMockModule(tsoConfig));
         tso = injector.getInstance(TSOServer.class);
-        tso.startAndWait();
+        tso.startAsync();
+        tso.awaitRunning();
 
         OmidClientConfiguration clientConfig = new OmidClientConfiguration();
         clientConfig.setConnectionString("localhost:" + port);
@@ -183,7 +184,8 @@ public void close() throws IOException {
                 transactionManager.close();
             }
             if (tso != null) {
-                tso.stopAndWait();
+                tso.stopAsync();
+                tso.awaitTerminated();
             }
         }
     }
diff --git a/pom.xml b/pom.xml
index dcddcfe2fe1..fa388428e7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <avatica.version>1.12.0</avatica.version>
     <jettyVersion>8.1.7.v20120910</jettyVersion>
     <tephra.version>0.15.0-incubating</tephra.version>
-    <omid.version>1.0.1</omid.version>
+    <omid.version>1.0.2</omid.version>
     <spark.version>2.4.0</spark.version>
     <scala.version>2.11.8</scala.version>
     <scala.binary.version>2.11</scala.binary.version>