diff --git a/Changelog.md b/Changelog.md
index ece019c6c..84e64e77c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,8 @@
 ## Refactor
 
 ## Bug fixes
-* Fix empty name field when editing aspect names [#6548](https://github.com/diaspora/diaspora/issues/6548)
+* Fix empty name field when editing aspect names [#6706](https://github.com/diaspora/diaspora/pull/6706)
+* Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
 
 ## Features
 
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 5b802635c..4ba846ed1 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -47,4 +47,26 @@ describe SessionsController, type: :controller do
       expect(response).to redirect_to root_path
     end
   end
+
+  describe "#reset_authentication_token" do
+    context "for a logged in user" do
+      before do
+        sign_in :user, @user
+      end
+
+      it "succeeds" do
+        expect { @controller.send(:reset_authentication_token) }.to_not raise_error
+      end
+    end
+
+    context "for a logged out user" do
+      before do
+        sign_out :user
+      end
+
+      it "succeeds" do
+        expect { @controller.send(:reset_authentication_token) }.to_not raise_error
+      end
+    end
+  end
 end