diff --git a/app/src/main/java/io/strongapp/strong/common/enums/PersonalRecordType.java b/app/src/main/java/io/strongapp/strong/common/enums/PersonalRecordType.java
index f6401b089..5de88cccf 100644
--- a/app/src/main/java/io/strongapp/strong/common/enums/PersonalRecordType.java
+++ b/app/src/main/java/io/strongapp/strong/common/enums/PersonalRecordType.java
@@ -4,8 +4,6 @@ import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;

-import java.util.Objects;
-
 import androidx.annotation.StringRes;
 import io.realm.RealmList;
 import io.strongapp.strong.R;
@@ -38,12 +36,12 @@ public enum PersonalRecordType implements Parcelable {
                 return false;
             }

-            return newSet.getReps() > oldSet.getReps() || (Objects.equals(newSet.getReps(), oldSet.getReps()) && newSet.getKilograms() > oldSet.getKilograms());
+            return newSet.getReps() > oldSet.getReps() || (newSet.getReps().equals(oldSet.getReps()) && newSet.getKilograms() > oldSet.getKilograms());
         }

         @Override
         public boolean isValid(ExerciseSet exerciseSet) {
-            return isCompleted(exerciseSet) && exerciseSet.getReps() != null && exerciseSet.getReps() > 0;
+            return isCompleted(exerciseSet) && exerciseSet.getReps() != null && exerciseSet.getReps() > 0 && exerciseSet.getKilograms() != null && exerciseSet.getKilograms() > 0;
         }

         @Override
@@ -88,7 +86,7 @@ public enum PersonalRecordType implements Parcelable {
             return getValueAsString(context, user, bestSet);
         }
     },
-    MAX_VOLUME_ADDED(R.string.exercise_records__max_volume_pretty_name, R.string.exercise_records__max_volume_added_full_name){
+    MAX_VOLUME_ADDED(R.string.exercise_records__max_volume_pretty_name, R.string.exercise_records__max_volume_added_full_name) {
         @Override
         public String getValueAsString(Context context, User user, ExerciseSet exerciseSet) {
             // 5164 kg