diff --git a/Changelog.md b/Changelog.md
index 2f569b5da..d9bf1968a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@
 ## Refactor
 * Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
 * Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
+* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
 
 ## Bug fixes
 
diff --git a/app/assets/javascripts/helpers/markdown_editor.js b/app/assets/javascripts/helpers/markdown_editor.js
index 55df13480..5706888a1 100644
--- a/app/assets/javascripts/helpers/markdown_editor.js
+++ b/app/assets/javascripts/helpers/markdown_editor.js
@@ -65,7 +65,7 @@ Diaspora.MarkdownEditor.prototype = {
     var tabElement = $("<ul class='nav nav-tabs btn-group write-preview-tabs'></ul>");
 
     var writeTab = $("<li class='active full-height' role='presentation'></li>");
-    this.writeLink = $("<a class='full-height md-write-tab' href='#'></a>")
+    this.writeLink = $("<a class='full-height md-write-tab' href='#' data-target=' '></a>")
       .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.write"));
 
     this.writeLink.append($("<i class='visible-sm visible-xs visible-md diaspora-custom-compose'></i>"));
@@ -80,7 +80,7 @@ Diaspora.MarkdownEditor.prototype = {
     writeTab.append(this.writeLink);
 
     var previewTab = $("<li class='full-height' role='presentation'></li>");
-    this.previewLink = $("<a class='full-height md-preview-tab' href='#'></a>")
+    this.previewLink = $("<a class='full-height md-preview-tab' href='#' data-target=' '></a>")
       .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.preview"));
 
     this.previewLink.append($("<i class='visible-sm visible-xs visible-md entypo-search'>"));
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index ab8a27a95..ee9eb0fb7 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -43,7 +43,7 @@
 
           <ul class="nav navbar-nav navbar-left nav-badges hidden-sm hidden-xs">
             <li class="dropdown" id="notification-dropdown">
-              <a id="notifications-link" href="/notifications" title="{{t "header.notifications"}}" class="notifications-link nav-badge hidden-sm hidden-xs" role="button" data-toggle="dropdown" aria-expanded="false" data-target="#">
+              <a id="notifications-link" href="/notifications" title="{{t "header.notifications"}}" class="notifications-link nav-badge hidden-sm hidden-xs" role="button" data-toggle="dropdown" aria-expanded="false" data-target=" ">
                 <i class="entypo-bell"></i>
                 <span class="badge badge-important {{#unless current_user.notifications_count}} hidden {{/unless}}">
                   {{current_user.notifications_count}}
diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml
index 733db4135..95a493f9e 100644
--- a/app/views/aspects/_no_contacts_message.haml
+++ b/app/views/aspects/_no_contacts_message.haml
@@ -9,7 +9,7 @@
   %p
     != t(".try_adding_some_more_contacts",
          invite_link: link_to(t(".invite_link_text"),
-                                "#",
+                                " ",
                                 class: "invitations-link",
                                 data: {toggle: "modal"}))