diff --git a/src/main/java/run/halo/app/model/entity/ThemeSetting.java b/src/main/java/run/halo/app/model/entity/ThemeSetting.java
index b7b8ca9c9..fff876cb5 100644
--- a/src/main/java/run/halo/app/model/entity/ThemeSetting.java
+++ b/src/main/java/run/halo/app/model/entity/ThemeSetting.java
@@ -23,13 +23,9 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 public class ThemeSetting extends BaseEntity {
 
-    /**
-     * Theme id as id.
-     */
     @Id
-    @Column(name = "id", columnDefinition = "varchar(255) not null")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private String id;
+    private Integer id;
 
     /**
      * Setting key.
@@ -43,4 +39,10 @@ public class ThemeSetting extends BaseEntity {
     @Column(name = "setting_value", columnDefinition = "varchar(10239) not null")
     private String value;
 
+    /**
+     * Theme id.
+     */
+    @Column(name = "theme_id", columnDefinition = "varchar(255) not null")
+    private String themeId;
+
 }