diff --git a/types/data.go b/types/data.go
index 61f3d0a..1488aed 100644
--- a/types/data.go
+++ b/types/data.go
@@ -321,12 +321,17 @@ func (data Data) MustGetBool(key string) bool {
 
 // GetTimestamp 取得時間戳記
 func (data Data) GetTimestamp(key string) (Timestamp, error) {
-	value, err := data.GetInt64(key)
+	value, err := data.Get(key)
 	if err != nil {
 		return 0, err
 	}
 
-	return Timestamp(value), nil
+	switch value.(type) {
+	case Timestamp:
+		return value.(Timestamp), nil
+	}
+
+	return 0, ErrFormat
 }
 
 // MustGetTimestamp 強制取得時間戳記