diff --git a/msfconsole b/msfconsole
index d0f762fec2..62294a4e31 100755
--- a/msfconsole
+++ b/msfconsole
@@ -8,7 +8,8 @@
 require 'pathname'
 
 begin
-  # TODO: Temporary until warnings can be turned on only for developers to prevent confusion for end users
+
+  # Silences warnings as they only serve to confuse end users
   if defined?(Warning) && Warning.respond_to?(:[]=)
     Warning[:deprecated] = false
   end
diff --git a/msfvenom b/msfvenom
index 07d9cbf98a..d885ab667a 100755
--- a/msfvenom
+++ b/msfvenom
@@ -8,6 +8,11 @@ class UsageError < MsfVenomError; end
 require 'optparse'
 require 'timeout'
 
+# Silences warnings as they only serve to confuse end users
+if defined?(Warning) && Warning.respond_to?(:[]=)
+  Warning[:deprecated] = false
+end
+
 msfbase = __FILE__
 while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))