diff --git a/internal/api/client/auth/authorize.go b/internal/api/client/auth/authorize.go
index d67b39ed5..0328f3b21 100644
--- a/internal/api/client/auth/authorize.go
+++ b/internal/api/client/auth/authorize.go
@@ -70,9 +70,7 @@ func (m *Module) AuthorizeGETHandler(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "no client_id found in session"})
 		return
 	}
-	app := &gtsmodel.Application{
-		ClientID: clientID,
-	}
+	app := &gtsmodel.Application{}
 	if err := m.db.GetWhere(c.Request.Context(), []db.Where{{Key: sessionClientID, Value: app.ClientID}}, app); err != nil {
 		m.clearSession(s)
 		c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("no application found for client id %s", clientID)})
diff --git a/internal/gtsmodel/status.go b/internal/gtsmodel/status.go
index c9766a7f2..fd33bd788 100644
--- a/internal/gtsmodel/status.go
+++ b/internal/gtsmodel/status.go
@@ -45,9 +45,9 @@ type Status struct {
 	EmojiIDs []string `bun:"emojis,array"`
 	Emojis   []*Emoji `bun:"attached_emojis,m2m:status_to_emojis"` // https://bun.uptrace.dev/guide/relations.html#many-to-many-relation
 	// when was this status created?
-	CreatedAt time.Time `bun:",notnull,default:current_timestamp"`
+	CreatedAt time.Time `bun:",notnull,nullzero,default:current_timestamp"`
 	// when was this status updated?
-	UpdatedAt time.Time `bun:",notnull,default:current_timestamp"`
+	UpdatedAt time.Time `bun:",notnull,nullzero,default:current_timestamp"`
 	// is this status from a local account?
 	Local bool
 	// which account posted this status?
diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go
index ad4c2e109..46132233b 100644
--- a/internal/typeutils/astointernal.go
+++ b/internal/typeutils/astointernal.go
@@ -220,6 +220,7 @@ func (c *converter) ASStatusToStatus(ctx context.Context, statusable ap.Statusab
 	published, err := ap.ExtractPublished(statusable)
 	if err == nil {
 		status.CreatedAt = published
+		status.UpdatedAt = published
 	}
 
 	// which account posted this status?