diff --git a/big_tests/rebar.config b/big_tests/rebar.config
index dee4f2217f4..d43240b20c1 100644
--- a/big_tests/rebar.config
+++ b/big_tests/rebar.config
@@ -18,7 +18,7 @@
         {escalus, "4.2.5"},
         {cowboy, "2.9.0"},
         {csv, "3.0.3", {pkg, csve}},
-        {amqp_client, "3.9.1"},
+        {amqp_client, "3.9.5"},
         {esip, "1.0.43"},
         {jid, "1.0.0", {pkg, mongoose_jid}}
 ]}.
diff --git a/big_tests/rebar.lock b/big_tests/rebar.lock
index 656da65f8fa..d4c244c477c 100644
--- a/big_tests/rebar.lock
+++ b/big_tests/rebar.lock
@@ -1,5 +1,5 @@
 {"1.2.0",
-[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.1">>},0},
+[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.5">>},0},
  {<<"base16">>,{pkg,<<"base16">>,<<"2.0.0">>},0},
  {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0},
@@ -25,7 +25,7 @@
  {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.23">>},1},
  {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.2">>},2},
- {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.1">>},1},
+ {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.5">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"recon">>,{pkg,<<"recon">>,<<"2.5.1">>},2},
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.25">>},1},
@@ -34,7 +34,7 @@
  {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"4.0.3">>},1}]}.
 [
 {pkg_hash,[
- {<<"amqp_client">>, <<"CD798BAC0BDAF578CDC18E0DE257927B4FCDFAAA7A976D73F62064A0613D4701">>},
+ {<<"amqp_client">>, <<"BE7B022550F1C0DDFB23A3145FC3D59B5EDB9FDFCC1DD705796C97F77E9EAC98">>},
  {<<"base16">>, <<"9DA694FA0778DF31522A1B9EB349BA4AC9063B497234DC49509C1F5C37F336A2">>},
  {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>},
  {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
@@ -58,7 +58,7 @@
  {<<"p1_utils">>, <<"7F94466ADA69BD982EA7BB80FBCA18E7053E7D0B82C9D9E37621FA508587069B">>},
  {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
  {<<"quickrand">>, <<"1D73FAA52E0C149FCBC72A63C26135FF68BE8FA7870675C73645896788A7540C">>},
- {<<"rabbit_common">>, <<"78B899F8C83A4F543CDD978F6B181FE335397DD166AD82E1E65E0CE0C0556DB7">>},
+ {<<"rabbit_common">>, <<"4F94E901782DB08D2E944BEA8D8537010F724D1E37D7948661E48B887728C2A3">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>},
  {<<"stringprep">>, <<"15062F6020777A51A96488F29CE9A2D83E3195F92FDF27F25ACC462DFF7D8D82">>},
@@ -66,7 +66,7 @@
  {<<"uuid">>, <<"0D1CA9D94CA3B058467BCE20B7706CC816A2BDBBE0574DD008936AE97EA4EBE7">>},
  {<<"worker_pool">>, <<"729D98AF0EEF31D10A6027C5AF2EDD4EA7D6CF91E96B03C189BB47F6FDE9667C">>}]},
 {pkg_hash_ext,[
- {<<"amqp_client">>, <<"09736C85991720FB18C527F6A31A474CCA4DE1335344CDCAA8720008E1D80EFB">>},
+ {<<"amqp_client">>, <<"DC7CD4D35B4AFF28620F7CD58A9B8F394DAD93CF896704B1F770554F5FF20FDE">>},
  {<<"base16">>, <<"63067A9F73D2422F15344A1EAF7033C3B339DC64DA0229DE3DF26F0F6F1E4F82">>},
  {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>},
  {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
@@ -90,7 +90,7 @@
  {<<"p1_utils">>, <<"47F21618694EEEE5006AF1C88731AD86B757161E7823C29B6F73921B571C8502">>},
  {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
  {<<"quickrand">>, <<"E21C6C7F29CA995468662085CA54D7D09E861C180A9DFEC2CF4A2E75364A16D6">>},
- {<<"rabbit_common">>, <<"6A03CC1BF03B16134E529E434EE2B17831F6BE10176ED739B1AC55CA9F26FB2E">>},
+ {<<"rabbit_common">>, <<"D4F238DF7C2DC67ECECCD1E8A70EAFCC15FDB69DB1E82820533DBE92A229655A">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"recon">>, <<"5721C6B6D50122D8F68CCCAC712CAA1231F97894BAB779EFF5FF0F886CB44648">>},
  {<<"stringprep">>, <<"8E0807D94A6927D1C3F8E76D584A2E3CDD9B4BCB02823EAF96629EDF2A65B104">>},
diff --git a/rebar.config b/rebar.config
index ed32e7f0a23..d584259ee6a 100644
--- a/rebar.config
+++ b/rebar.config
@@ -102,7 +102,7 @@
   {gun, "1.3.3"},
   {nkpacket, {git, "https://github.com/michalwski/nkpacket.git", {ref, "f7c5349"}}},
   {nksip, {git, "https://github.com/NetComposer/nksip.git", {ref, "1a29ef3"}}},
-  {amqp_client, "3.8.14"},
+  {amqp_client, "3.9.5"},
   {eredis, "1.2.0"},
   {gen_fsm_compat, "0.3.0"},
   {erlang_pmp, "0.1.1"},
diff --git a/rebar.lock b/rebar.lock
index 6bc7ad92497..f5979d26220 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,5 +1,5 @@
 {"1.2.0",
-[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.8.14">>},0},
+[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.5">>},0},
  {<<"backoff">>,{pkg,<<"backoff">>,<<"1.1.3">>},1},
  {<<"base16">>,{pkg,<<"base16">>,<<"2.0.0">>},0},
  {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0},
@@ -121,7 +121,7 @@
  {<<"pooler">>,{pkg,<<"pooler">>,<<"1.5.3">>},1},
  {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.8.0">>},1},
- {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.8.14">>},1},
+ {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.5">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"re2">>,
   {git,"https://github.com/dukesoferl/re2.git",
@@ -159,7 +159,7 @@
  {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"4.0.3">>},0}]}.
 [
 {pkg_hash,[
- {<<"amqp_client">>, <<"7569517AEFB47E0D1C41BCA2F4768DC8A2D88487DAF7819FECCA0D78943F293C">>},
+ {<<"amqp_client">>, <<"BE7B022550F1C0DDFB23A3145FC3D59B5EDB9FDFCC1DD705796C97F77E9EAC98">>},
  {<<"backoff">>, <<"DE762C05ED6DFAE862D83DC9E58AE936792B01302B3595F5CFFE86F2D8E6C1DD">>},
  {<<"base16">>, <<"9DA694FA0778DF31522A1B9EB349BA4AC9063B497234DC49509C1F5C37F336A2">>},
  {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>},
@@ -199,7 +199,7 @@
  {<<"pooler">>, <<"898CD1FA301FC42D4A8ED598CE139B71CA85B54C16AB161152B5CC5FBDCFA1A8">>},
  {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
  {<<"quickrand">>, <<"E47CE597FF067385FF5836C8C7706AC7F8AA7B47DD90C6417E05B64696F872FA">>},
- {<<"rabbit_common">>, <<"CC1604891295CD82F34597F1526AC611EA7B6A0E57B3DD79B41CB4224BCC6EC5">>},
+ {<<"rabbit_common">>, <<"4F94E901782DB08D2E944BEA8D8537010F724D1E37D7948661E48B887728C2A3">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>},
  {<<"redbug">>, <<"9153EE50E42C39CE3F6EFA65EE746F4A52896DA66862CFB59E7C0F838B7B8414">>},
@@ -212,7 +212,7 @@
  {<<"uuid">>, <<"280014F8FF57FCE36EE6E91C3ECF21CBFCE78AAE9854C09597BB4C11E27B66D6">>},
  {<<"worker_pool">>, <<"729D98AF0EEF31D10A6027C5AF2EDD4EA7D6CF91E96B03C189BB47F6FDE9667C">>}]},
 {pkg_hash_ext,[
- {<<"amqp_client">>, <<"E5BA3AC18ABBE34A1D990A6BCAC25633DC7061AB8F8D101C7DCFF97F49F4C523">>},
+ {<<"amqp_client">>, <<"DC7CD4D35B4AFF28620F7CD58A9B8F394DAD93CF896704B1F770554F5FF20FDE">>},
  {<<"backoff">>, <<"30CEAD738D20E4C8D36CD37857DD5E23AEBA57CB868BF64766D47D371422BDFF">>},
  {<<"base16">>, <<"63067A9F73D2422F15344A1EAF7033C3B339DC64DA0229DE3DF26F0F6F1E4F82">>},
  {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>},
@@ -252,7 +252,7 @@
  {<<"pooler">>, <<"058D85C5081289B90E97E4DDDBC3BB5A3B4A19A728AB3BC88C689EFCC36A07C7">>},
  {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
  {<<"quickrand">>, <<"7FFADCF851FB4D1F7BC2952E955623BE63F9C4A6B965FD207CC558D5AEDBB6F9">>},
- {<<"rabbit_common">>, <<"27409E425413CDD3FC2C077CF08226C4A307D56B1467883F26AB3789B2E106D0">>},
+ {<<"rabbit_common">>, <<"D4F238DF7C2DC67ECECCD1E8A70EAFCC15FDB69DB1E82820533DBE92A229655A">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"recon">>, <<"5721C6B6D50122D8F68CCCAC712CAA1231F97894BAB779EFF5FF0F886CB44648">>},
  {<<"redbug">>, <<"BFC7BCB8743C55DBE0134DBCB89DD6A57606288CC4E2570ECCD701061FBCBD93">>},