diff --git a/handlers/app.go b/handlers/app.go
index c8fbc6c..7f54ed0 100644
--- a/handlers/app.go
+++ b/handlers/app.go
@@ -1,11 +1,13 @@
 package handlers
 
 import (
-    "context"
-    "database/sql"
-    "html/template"
-    "net/http"
-    "github.com/gorilla/sessions"
+	"context"
+	"database/sql"
+	"html/template"
+	"log"
+	"net/http"
+
+	"github.com/gorilla/sessions"
 )
 
 type PageData struct {
@@ -46,24 +48,21 @@ func (app *App) SessionMW(next http.HandlerFunc) http.HandlerFunc {
                 HttpOnly: true,
             }
         }
-        if _, ok := session.Values["user_id"].(int); ok {
-            // Skip IP and User-Agent check for WebSocket connections
-            if r.URL.Query().Get("ws") != "true" {
-                if session.Values["user_ip"] != r.RemoteAddr || session.Values["user_agent"] != r.UserAgent() {
-                    session.Values = make(map[interface{}]interface{})
-                    session.Options.MaxAge = -1
-                    session.Save(r, w)
-                    http.Redirect(w, r, app.Config.ThreadrDir+"/login/?error=session", http.StatusFound)
-                    return
-                }
-            }
-            ctx := context.WithValue(r.Context(), "session", session)
-            r = r.WithContext(ctx)
-        } else {
-            ctx := context.WithValue(r.Context(), "session", session)
-            r = r.WithContext(ctx)
-        }
+
+        ctx := context.WithValue(r.Context(), "session", session)
+        r = r.WithContext(ctx)
+
         next(w, r)
+
+        if err := session.Save(r, w); err != nil {
+            /*
+            Ok, so here's the thing
+            Errors coming from this function here "can" be ignored.
+            They mostly come from errors while setting cookies, so in some
+            environments this will trigger a lot, but they are harmless.
+            */
+            log.Printf("Error saving session in SessionMW: %v", err)
+        }
     }
 }
 
@@ -76,4 +75,4 @@ func (app *App) RequireLoginMW(next http.HandlerFunc) http.HandlerFunc {
         }
         next(w, r)
     }
-}
+}
\ No newline at end of file