diff --git a/handler/session.go b/handler/session.go
index 5d3606a..6985327 100644
--- a/handler/session.go
+++ b/handler/session.go
@@ -27,6 +27,10 @@ func validSession(c echo.Context) {
 
 // currentUser to get username of logged in user
 func currentUser(c echo.Context) string {
+	if util.DisableLogin {
+		return ""
+	}
+
 	sess, _ := session.Get("session", c)
 	username := fmt.Sprintf("%s", sess.Values["username"])
 	return username