diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index 867445aac2..7c716db67c 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -83,7 +83,9 @@ func (us SqlUserStore) UpgradeSchemaIfNeeded() {
 			SELECT
 				Id, '`+model.PREFERENCE_CATEGORY_THEME+`', '', ThemeProps
 			FROM
-				Users`, params); err != nil {
+				Users
+			WHERE
+				Users.ThemeProps != 'null'`, params); err != nil {
 			themeMigrationFailed(err)
 		}