diff --git a/src/main/java/org/influxdb/impl/InfluxDBResultMapper.java b/src/main/java/org/influxdb/impl/InfluxDBResultMapper.java
index 2188bcd18..54f34721c 100644
--- a/src/main/java/org/influxdb/impl/InfluxDBResultMapper.java
+++ b/src/main/java/org/influxdb/impl/InfluxDBResultMapper.java
@@ -203,9 +203,10 @@ <T> void setFieldValue(final T object, final Field field, final Object value)
       return;
     }
     Class<?> fieldType = field.getType();
-    boolean oldAccessibleState = field.isAccessible();
     try {
-      field.setAccessible(true);
+      if (!field.isAccessible()) {
+        field.setAccessible(true);
+      }
       if (fieldValueModified(fieldType, field, object, value)
         || fieldValueForPrimitivesModified(fieldType, field, object, value)
         || fieldValueForPrimitiveWrappersModified(fieldType, field, object, value)) {
@@ -219,8 +220,6 @@ <T> void setFieldValue(final T object, final Field field, final Object value)
         + "The correct type is '%s' (current field value: '%s').";
       throw new InfluxDBMapperException(
         String.format(msg, object.getClass().getName(), field.getName(), value.getClass().getName(), value));
-    } finally {
-      field.setAccessible(oldAccessibleState);
     }
   }