diff --git a/helm-quarry/values.yaml b/helm-quarry/values.yaml
index 9fc0cef..5f37cd1 100644
--- a/helm-quarry/values.yaml
+++ b/helm-quarry/values.yaml
@@ -1,7 +1,7 @@
 web:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-66 # web tag managed by github actions
+  tag: pr-13 # web tag managed by github actions
 
 worker:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-66 # worker tag managed by github actions
+  tag: pr-13 # worker tag managed by github actions
\ No newline at end of file
diff --git a/quarry/web/query.py b/quarry/web/query.py
index c9463bc..58eb821 100644
--- a/quarry/web/query.py
+++ b/quarry/web/query.py
@@ -31,6 +31,7 @@ def new_query():
         return redirect("/login?next=/query/new")
     query = Query()
     query.user = get_user()
+    query.title = "Untitled query"
     g.conn.session.add(query)
     g.conn.session.commit()
     return redirect(url_for("query.query_show", query_id=query.id))
diff --git a/quarry/web/static/js/query/view.js b/quarry/web/static/js/query/view.js
index 4893c4d..502b30f 100644
--- a/quarry/web/static/js/query/view.js
+++ b/quarry/web/static/js/query/view.js
@@ -130,7 +130,7 @@ $( function () {
 				query_id: vars.query_id,
 				title: title
 			} ).done( function ( /* data */ ) {
-				document.title = ( title || 'Untitled query #' + vars.query_id ) + ' - Quarry';
+				document.title =  title + ' - Quarry';
 			} );
 		} );
 	}
@@ -243,7 +243,7 @@ $( function () {
 				);
 
 				if ( !silent && vars.preferences.use_notifications ) {
-					let title = $( '#title' ).val() ? '"' + $( '#title' ).val() + '"' : 'Untitled query #' + vars.query_id;
+					let title = '"' + $( '#title' ).val() + '"';
 					sendNotification( title + ' execution has been completed' );
 				}
 
diff --git a/quarry/web/templates/query/list.html b/quarry/web/templates/query/list.html
index 34d8344..4fec5f6 100644
--- a/quarry/web/templates/query/list.html
+++ b/quarry/web/templates/query/list.html
@@ -32,7 +32,7 @@
         <tbody>
         {% for query in queries %}
             <tr>
-                <td><a href="/query/{{query.id}}">{% if query.title %}{{query.title}}{% else %}Untitled query #{{query.id}}{% endif %}</a></td>
+                <td><a href="/query/{{query.id}}">{{query.title}}</a></td>
                 <td><a href="/{{query.user.username}}">{{query.user.username}}</a></td>
                 <td>{{query.latest_rev.latest_run.status_message}}</td>
                 <td title="{{query.latest_rev.latest_run.timestamp}} UTC">{{query.latest_rev.latest_run.timestamp|timesince}}</td>
diff --git a/quarry/web/templates/query/view.html b/quarry/web/templates/query/view.html
index bacff72..7a7f60e 100644
--- a/quarry/web/templates/query/view.html
+++ b/quarry/web/templates/query/view.html
@@ -16,7 +16,7 @@
 <script src="/static/js/query/view.js?v=2"> </script>
 {% endblock %}
 {% block title %}
-{% if query.title %}{{query.title}}{% else %}Untitled query #{{ query.id }}{% endif %} - Quarry
+{{query.title}} - Quarry
 {% endblock %}
 {% block content %}
 <div id="content" class="container {% if jsvars.can_edit %}edit{% else %}no-edit{% endif %} {% if jsvars.is_starred %}starred{% endif %} {% if query.published %}published {% endif %}">
@@ -24,7 +24,7 @@
 
 
         <div class="col-md-10">
-            <h2><input type="textbox" id="title" {% if jsvars.can_edit %}placeholder="Click to add title..."{% else %}readonly{% endif %} value="{% if query.title %}{{query.title}}{% endif %}"> </input></h2>
+            <h2><input type="textbox" id="title" value="{% if query.title %}{{query.title}}{% endif %}"> </input></h2>
         </div>
 
         <div class="col-md-2" id="title-actions-container">
@@ -50,11 +50,7 @@ <h2><input type="textbox" id="title" {% if jsvars.can_edit %}placeholder="Click
             <small>
             Fork of
             <a href='/query/{{query.parent.id}}'>
-                {% if query.parent.title %}
                 {{ query.parent.title }}
-                {% else %}
-                Untitled query #{{ query.parent.id }}
-                {% endif %}
             </a>
             by <a href='/{{ query.parent.user.username }}'>{{ query.parent.user.username }}</a>
         </small>
diff --git a/quarry/web/templates/user.html b/quarry/web/templates/user.html
index 42a0894..2b307b4 100644
--- a/quarry/web/templates/user.html
+++ b/quarry/web/templates/user.html
@@ -24,7 +24,7 @@ <h3>Published queries</h3>
             <ul class="query-items-list">
                 {% for query in published_queries %}
                 <li class="query-item">
-                    <a class="query-title" href="/query/{{query.id}}">{% if query.title %}{{query.title}}{% else %}Untitled query #{{query.id}}{% endif %}</a>
+                    <a class="query-title" href="/query/{{query.id}}">{{query.title}}</a>
                     <small>{{query.last_touched|timesince}}</small>
                 </li>
                 {% else %}
@@ -37,7 +37,7 @@ <h3>Starred Queries</h3>
             <ul class="query-items-list">
                 {% for star in stars %}
                 <li class="query-item">
-                    <a class="query-title" href="/query/{{star.query.id}}">{% if star.query.title %}{{star.query.title}}{% else %}Untitled query #{{star.query.id}}{% endif %}</a>
+                    <a class="query-title" href="/query/{{star.query.id}}">{{star.query.title}}</a>
                 </li>
                 {% else %}
                     This user has not starred any queries yet.
@@ -51,7 +51,7 @@ <h3>Draft Queries</h3>
             <ul class="query-items-list">
                 {% for query in draft_queries %}
                 <li class="query-item">
-                    <a class="query-title" href="/query/{{query.id}}">{% if query.title %}{{query.title}}{% else %}Untitled query #{{query.id}}{% endif %}</a>
+                    <a class="query-title" href="/query/{{query.id}}">{{query.title}}</a>
                     <small>{{query.last_touched|timesince}}</small>
                 </li>
                 {% else %}