diff --git a/src/System Application/App/Performance Profiler/src/PerfProfActivityMapper.Codeunit.al b/src/System Application/App/Performance Profiler/src/PerfProfActivityMapper.Codeunit.al
index dd7747a9b0..0c9601f3a8 100644
--- a/src/System Application/App/Performance Profiler/src/PerfProfActivityMapper.Codeunit.al	
+++ b/src/System Application/App/Performance Profiler/src/PerfProfActivityMapper.Codeunit.al	
@@ -31,6 +31,8 @@ codeunit 1934 "Perf. Prof. Activity Mapper"
                 ActivityType := ActivityType::"Web Client";
             ClientType::"Web Service":
                 ActivityType := ActivityType::"Web API Client";
+            else
+                ActivityType := ActivityType::"Web Client";
         end;
     end;
 }
\ No newline at end of file
diff --git a/src/System Application/App/Performance Profiler/src/PerformanceProfileList.Page.al b/src/System Application/App/Performance Profiler/src/PerformanceProfileList.Page.al
index 6a326be945..369fdf21bb 100644
--- a/src/System Application/App/Performance Profiler/src/PerformanceProfileList.Page.al	
+++ b/src/System Application/App/Performance Profiler/src/PerformanceProfileList.Page.al	
@@ -234,7 +234,7 @@ page 1931 "Performance Profile List"
     var
         RecordRef: RecordRef;
     begin
-        Rec.SetAutoCalcFields("User Name", "Client Type");
+        Rec.SetAutoCalcFields("User Name");
         RecordRef.GetTable(Rec);
         ScheduledPerfProfilerImpl.FilterUsers(RecordRef, UserSecurityId(), false);
         RecordRef.SetTable(Rec);
@@ -256,7 +256,6 @@ page 1931 "Performance Profile List"
 
     local procedure MapClientTypeToActivityType()
     begin
-        Rec.CalcFields(Rec."Client Type");
         PerfProfActivityMapper.MapClientTypeToActivityType(rec."Client Type", ActivityType);
     end;
 
@@ -268,7 +267,7 @@ page 1931 "Performance Profile List"
             exit(PerformanceProfileScheduler.Description);
     end;
 
-local procedure ComputePlatformCallDuration(): Duration
+    local procedure ComputePlatformCallDuration(): Duration
     var
         diff: Duration;
     begin