diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index 768de46..c237d2b 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -40,12 +40,12 @@ module RemoteStorage
     def get_data(user, directory, key)
       object = data_bucket.get("#{user}:#{directory}:#{key}")
 
-      server.halt 304 if server.env["HTTP_IF_NONE_MATCH"] == object.etag
-
       server.headers["Content-Type"] = object.content_type
       server.headers["Last-Modified"] = last_modified_date_for(object)
       server.headers["ETag"] = object.etag
 
+      server.halt 304 if server.env["HTTP_IF_NONE_MATCH"] == object.etag
+
       if binary_key = object.meta["binary_key"]
         object = cs_binary_bucket.files.get(binary_key[0])
 
@@ -70,14 +70,14 @@ module RemoteStorage
     def get_directory_listing(user, directory)
       directory_object = directory_bucket.get("#{user}:#{directory}")
 
-      server.halt 304 if server.env["HTTP_IF_NONE_MATCH"] == directory_object.etag
-
       timestamp = directory_object.data.to_i
       timestamp /= 1000 if timestamp.to_s.length == 13
       server.headers["Content-Type"] = "application/json"
       server.headers["Last-Modified"] = Time.at(timestamp).to_s(:rfc822)
       server.headers["ETag"] = directory_object.etag
 
+      server.halt 304 if server.env["HTTP_IF_NONE_MATCH"] == directory_object.etag
+
       listing = directory_listing(user, directory)
 
       return listing.to_json
diff --git a/spec/directories_spec.rb b/spec/directories_spec.rb
index 1e5f656..16124ea 100644
--- a/spec/directories_spec.rb
+++ b/spec/directories_spec.rb
@@ -80,6 +80,7 @@ describe "Directories" do
 
         last_response.status.must_equal 304
         last_response.body.must_be_empty
+        last_response.headers["ETag"].must_equal @etag
       end
 
       it "responds normally when it does not match the current ETag" do
diff --git a/spec/riak_spec.rb b/spec/riak_spec.rb
index 1d1e6d5..1e1c3ba 100644
--- a/spec/riak_spec.rb
+++ b/spec/riak_spec.rb
@@ -89,6 +89,7 @@ describe "App with Riak backend" do
 
           last_response.status.must_equal 304
           last_response.body.must_be_empty
+          last_response.headers["ETag"].must_equal @etag
         end
 
         it "responds normally when it does not match the current ETag" do