diff --git a/src/exometer_admin.erl b/src/exometer_admin.erl
index 64b6f31..89bae08 100644
--- a/src/exometer_admin.erl
+++ b/src/exometer_admin.erl
@@ -413,12 +413,12 @@ create_reporter_tabs() ->
 create_ets_tabs() ->
     case ets:info(?EXOMETER_SHARED, name) of
         undefined ->
-            [ets:new(T, [public, named_table, set, {keypos,2}, {read_concurrency, true}, {write_concurrency, true}, {decentralized_counters, true}])
+            [ets:new(T, [public, named_table, set, {keypos,2}, {read_concurrency, true}, {write_concurrency, auto}, {decentralized_counters, true}])
              || T <- tables()],
             ets:new(?EXOMETER_SHARED, [public, named_table, ordered_set,
                                        {keypos, 2}]),
             ets:new(?EXOMETER_ENTRIES, [public, named_table, ordered_set,
-                                        {keypos, 2}, {read_concurrency, true}, {write_concurrency, true}]),
+                                        {keypos, 2}, {read_concurrency, true}, {write_concurrency, auto}]),
             ets:new(?EXOMETER_REPORTERS, [public, named_table, set,
                                           {keypos, 2}]),
             ets:new(?EXOMETER_SUBS, [public, named_table, ordered_set,
diff --git a/src/exometer_cache.erl b/src/exometer_cache.erl
index 0e284dc..4be433c 100644
--- a/src/exometer_cache.erl
+++ b/src/exometer_cache.erl
@@ -123,7 +123,7 @@ update_tref(Name, TRef) ->
 ensure_table() ->
     case ets:info(?TABLE, name) of
         undefined ->
-            ets:new(?TABLE, [set, public, named_table, {keypos, 2}, {read_concurrency, true}, {write_concurrency, true}]);
+            ets:new(?TABLE, [set, public, named_table, {keypos, 2}, {read_concurrency, true}, {write_concurrency, auto}]);
         _ ->
             true
     end.
diff --git a/src/exometer_uniform.erl b/src/exometer_uniform.erl
index 6f33195..1c5935e 100644
--- a/src/exometer_uniform.erl
+++ b/src/exometer_uniform.erl
@@ -51,7 +51,7 @@ behaviour() ->
 
 probe_init(Name, _Type, Options) ->
     St = process_opts(#st { name = Name }, [ {percentiles, [ 50, 75, 90, 95, 99, 999 ]} ] ++ Options),
-    EtsRef = ets:new(uniform, [ set, {keypos, 2}, {read_concurrency, true}, {write_concurrency, true} ]),
+    EtsRef = ets:new(uniform, [ set, {keypos, 2}, {read_concurrency, true}, {write_concurrency, auto} ]),
 
     %% Setup random seed, if not already done.
     case get(random_seed) of
@@ -105,7 +105,7 @@ probe_update(Value, St) ->
 
 probe_reset(St) ->
     ets:delete(St#st.ets_ref),
-    EtsRef = ets:new(uniform, [ set, { keypos, 2 }, {read_concurrency, true}, {write_concurrency, true} ]),
+    EtsRef = ets:new(uniform, [ set, { keypos, 2 }, {read_concurrency, true}, {write_concurrency, auto} ]),
     {ok, St#st { ets_ref = EtsRef, cur_sz = 0 }}.
 
 probe_sample(_St) ->