diff --git a/css/glowingbear.css b/css/glowingbear.css
index 47bb717..90d3a5a 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -535,6 +535,12 @@ li.buffer.indent.private a {
     padding-right: -15px;
 }
 
+.settings-help {
+    display: block;
+    margin: -5px 0 -3px 19px;
+    font-size: small;
+}
+
 /* */
 /* Mobile layout */
 /* */
diff --git a/index.html b/index.html
index d459bb6..f50e093 100644
--- a/index.html
+++ b/index.html
@@ -348,7 +348,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                   <div class="checkbox">
                     <label>
                       <input type="checkbox" ng-model="noembed">
-                       Hide embedded content by default
+                       Hide embedded content by default<span class="text-muted settings-help">NSFW content will be hidden</small>
                     </label>
                   </div>
                 </form>
diff --git a/js/plugin-directive.js b/js/plugin-directive.js
index fca573b..fa8dabd 100644
--- a/js/plugin-directive.js
+++ b/js/plugin-directive.js
@@ -19,7 +19,8 @@ weechat.directive('plugin', ['$rootScope', function($rootScope) {
 
             $scope.displayedContent = "";
 
-            $scope.plugin.visible = $rootScope.auto_display_embedded_content;
+            // Auto-display embedded content only if it isn't NSFW
+            $scope.plugin.visible = $rootScope.auto_display_embedded_content && !$scope.plugin.nsfw;
 
             // user-accessible hash key that is a valid CSS class name
             $scope.plugin.className = "embed_" + $scope.plugin.$$hashKey.replace(':','_');