diff --git a/mix.exs b/mix.exs
index c592422f2b4..57edadaf491 100644
--- a/mix.exs
+++ b/mix.exs
@@ -175,7 +175,7 @@ defmodule Ejabberd.MixProject do
                          {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}},
                          {config(:lua), {:luerl, "~> 1.2.0"}},
                          {config(:mysql), {:p1_mysql, git: "https://github.com/processone/p1_mysql" }},
-                         {config(:pgsql), {:p1_pgsql, git: "https://github.com/processone/p1_pgsql"}},
+                         {config(:pgsql), {:p1_pgsql, git: "https://github.com/badlop/p1_pgsql"}},
                          {config(:sqlite), {:sqlite3, "~> 1.1"}},
                          {config(:stun), {:stun, "~> 1.0"}}], do:
       dep
diff --git a/mix.lock b/mix.lock
index 3b6dc0e0a93..ab45236dd28 100644
--- a/mix.lock
+++ b/mix.lock
@@ -27,7 +27,7 @@
   "p1_acme": {:git, "https://github.com/processone/p1_acme", "176b4a8c67627c3229fbea3c05d82a5d567e6e49", [branch: "master"]},
   "p1_mysql": {:git, "https://github.com/processone/p1_mysql", "0dccb755a60cda61d41e7b092b344d38d1ebc802", []},
   "p1_oauth2": {:hex, :p1_oauth2, "0.6.14", "1c5f82535574de87e2059695ac4b91f8f9aebacbc1c80287dae6f02552d47aea", [:rebar3], [], "hexpm", "1fd3ac474e43722d9d5a87c6df8d36f698ed87af7bb81cbbb66361451d99ae8f"},
-  "p1_pgsql": {:git, "https://github.com/processone/p1_pgsql", "4c557921449cbd316348a1358061ce572fa978b4", []},
+  "p1_pgsql": {:git, "https://github.com/badlop/p1_pgsql", "98c32d06638b3606810c29bee7c21ab19efde1a4", []},
   "p1_utils": {:hex, :p1_utils, "1.0.25", "2d39b5015a567bbd2cc7033eeb93a7c60d8c84efe1ef69a3473faa07fa268187", [:rebar3], [], "hexpm", "9219214428f2c6e5d3187ff8eb9a8783695c2427420be9a259840e07ada32847"},
   "pkix": {:git, "https://github.com/processone/pkix", "03be27c7168449bdfeb8c5b6cc0f800f71f8cfe9", []},
   "sqlite3": {:hex, :sqlite3, "1.1.14", "f9ea0cff8540865fdfdb7e24eef34dc46677364b1c070896e99b5bf08c8a7fd7", [:rebar3], [], "hexpm", "85054b6ca297343c159ed6794a473ff2c8eeabd854b6fe02f711c0bfd373ce86"},
diff --git a/rebar.config b/rebar.config
index 5d63df68aa4..72cb4485718 100644
--- a/rebar.config
+++ b/rebar.config
@@ -61,7 +61,7 @@
          {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {branch, "master"}}}},
         {p1_oauth2, "~> 0.6.14", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.14"}}},
         {if_var_true, pgsql,
-         {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {branch, "master"}}}},
+         {p1_pgsql, ".*", {git, "https://github.com/badlop/p1_pgsql", {branch, "master"}}}},
         {p1_utils, "~> 1.0.25", {git, "https://github.com/processone/p1_utils", {tag, "1.0.25"}}},
         {pkix, ".*", {git, "https://github.com/processone/pkix", {branch, "master"}}},
         {if_var_true, sqlite,
diff --git a/rebar.lock b/rebar.lock
index 12deb6c9124..ee03f15a6df 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -24,8 +24,8 @@
   0},
  {<<"p1_oauth2">>,{pkg,<<"p1_oauth2">>,<<"0.6.14">>},0},
  {<<"p1_pgsql">>,
-  {git,"https://github.com/processone/p1_pgsql",
-       {ref,"4c557921449cbd316348a1358061ce572fa978b4"}},
+  {git,"https://github.com/badlop/p1_pgsql",
+       {ref,"98c32d06638b3606810c29bee7c21ab19efde1a4"}},
   0},
  {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.25">>},0},
  {<<"pkix">>,