diff --git a/server/s3/backend.go b/server/s3/backend.go
index 26a9674e5..f00d2149c 100644
--- a/server/s3/backend.go
+++ b/server/s3/backend.go
@@ -281,6 +281,11 @@ func (b *s3Backend) PutObject(
 		ti, _ = swift.FloatStringToTime(val)
 	}
 
+	// If Modified is not set, use current time
+	if ti.IsZero() {
+		ti = time.Now()
+	}
+
 	obj := model.Object{
 		Name:     path.Base(fp),
 		Size:     size,