diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java
index 276688c..5679591 100644
--- a/src/java/com/android/ims/MmTelFeatureConnection.java
+++ b/src/java/com/android/ims/MmTelFeatureConnection.java
@@ -484,22 +484,16 @@
     }
 
     public IImsConfig getConfigInterface() throws RemoteException {
-        synchronized (mLock) {
-            checkServiceIsReady();
-            return getConfig();
-        }
+        return getConfig();
     }
 
     public @ImsRegistrationImplBase.ImsRegistrationTech int getRegistrationTech()
-    throws RemoteException {
-        synchronized (mLock) {
-            checkServiceIsReady();
-            IImsRegistration registration = getRegistration();
-            if (registration != null) {
+            throws RemoteException {
+        IImsRegistration registration = getRegistration();
+        if (registration != null) {
                 return registration.getRegistrationTechnology();
-            } else {
-                return ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
-            }
+        } else {
+            return ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
         }
     }
 
