diff --git a/lib/facter/puppetdb_version.rb b/lib/facter/puppetdb_version.rb
new file mode 100644
index 00000000..04da0504
--- /dev/null
+++ b/lib/facter/puppetdb_version.rb
@@ -0,0 +1,13 @@
+Facter.add(:puppetdb_version) do
+  confine { Facter::Util::Resolution.which('puppetdb') }
+
+  setcode do
+    output = Facter::Core::Execution.execute('puppetdb --version')
+
+    if output.nil?
+      nil
+    else
+      output.split(':').last.strip
+    end
+  end
+end
diff --git a/spec/unit/facter/puppetdb_version_spec.rb b/spec/unit/facter/puppetdb_version_spec.rb
new file mode 100644
index 00000000..bbe7c846
--- /dev/null
+++ b/spec/unit/facter/puppetdb_version_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'facter'
+
+describe 'puppetdb_version' do
+  subject(:fact) { Facter.fact(:puppetdb_version) }
+
+  before(:each) do
+    Facter.clear
+  end
+
+  it 'should return the correct puppetdb version' do
+    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return('/usr/bin/puppetdb')
+    allow(Facter::Core::Execution).to receive(:execute).with('puppetdb --version').and_return("puppetdb version: 7.18.0\n")
+
+    expect(Facter.fact(:puppetdb_version).value).to eq('7.18.0')
+  end
+
+  it 'should return nil if puppetdb command is not available' do
+    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return(nil)
+
+    expect(Facter.fact(:puppetdb_version).value).to be_nil
+  end
+
+  it 'should return nil if puppetdb version output is nil' do
+    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return('/usr/bin/puppetdb')
+    allow(Facter::Core::Execution).to receive(:execute).with('puppetdb --version').and_return(nil)
+
+    expect(Facter.fact(:puppetdb_version).value).to be_nil
+  end
+end