diff --git a/Gemfile b/Gemfile
index 6be88022d..0485cecae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -132,6 +132,11 @@ gem 'psych', '<4'
 # For css and js compilation
 gem 'vite_rails', '~> 3.0.17'
 
+# Require net-http gem explicitly (and allow any version) to fix an issue where the net-protocol
+# dependency is loaded twice.  See this: https://stackoverflow.com/a/75105591
+# And this: https://github.com/ruby/net-imap/issues/16#issuecomment-803086765
+gem 'net-http'
+
 # Gem min versions that are only specified here because of vulnerabilities in earlier versions:
 gem 'rack-protection', '>= 1.5.5'
 gem 'loofah', '~> 2.20.0'
@@ -162,10 +167,6 @@ group :development do
   gem 'capistrano-cul', require: false
   gem 'capistrano-passenger', '~> 0.1', require: false
   gem 'capistrano-rails', '~> 1.4', require: false
-
-
-  # Use net-ssh >= 4.2 to prevent warnings with Ruby 2.4
-  gem 'net-ssh', '>= 4.2'
 end
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c4c19fc66..45320d98a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -287,8 +287,10 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     mysql2 (0.5.5)
+    net-http (0.4.0)
+      uri
     net-http-persistent (2.9.4)
-    net-imap (0.4.8)
+    net-imap (0.4.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -520,6 +522,7 @@ GEM
     uber (0.0.15)
     underscore-rails (1.8.3)
     unicode-display_width (1.5.0)
+    uri (0.13.0)
     uri_service (0.6.0)
       activesupport
       connection_pool
@@ -591,7 +594,7 @@ DEPENDENCIES
   mime-types
   mime-types-data
   mysql2 (~> 0.5.3)
-  net-ssh (>= 4.2)
+  net-http
   noid (>= 0.7.1)
   nokogiri (~> 1.15.5)
   psych (< 4)