diff --git a/Saradomin/Infrastructure/Services/ClientLaunchService.cs b/Saradomin/Infrastructure/Services/ClientLaunchService.cs
index 1d28d6c..e824081 100644
--- a/Saradomin/Infrastructure/Services/ClientLaunchService.cs
+++ b/Saradomin/Infrastructure/Services/ClientLaunchService.cs
@@ -36,6 +36,7 @@ namespace Saradomin.Infrastructure.Services
                 {
                     Arguments =
                         $"-Dsun.java2d.uiScale={_settingsService.Client.UiScale} "
+                        + $"-DclientFps={_settingsService.Client.Fps} "
                         + $"-DclientHomeOverride=\"{_settingsService.Launcher.InstallationDirectory}/\" "
                         + $"-jar \"{_clientUpdateService.PreferredTargetFilePath}\"",
                     WorkingDirectory = $"{_settingsService.Launcher.InstallationDirectory}",
diff --git a/Saradomin/Model/Settings/Client/ClientSettings.cs b/Saradomin/Model/Settings/Client/ClientSettings.cs
index b9a69e5..2776343 100644
--- a/Saradomin/Model/Settings/Client/ClientSettings.cs
+++ b/Saradomin/Model/Settings/Client/ClientSettings.cs
@@ -47,5 +47,8 @@ namespace Saradomin.Model.Settings.Client
 
         [JsonPropertyName("ui_scale")]
         public int UiScale { get; set; } = 1;
+
+        [JsonPropertyName("fps")]
+        public int Fps { get; set; } = 0;
     }
-}
\ No newline at end of file
+}
diff --git a/Saradomin/View/Controls/SettingsView.axaml b/Saradomin/View/Controls/SettingsView.axaml
index 16839e6..2dfc685 100644
--- a/Saradomin/View/Controls/SettingsView.axaml
+++ b/Saradomin/View/Controls/SettingsView.axaml
@@ -157,28 +157,58 @@
                                     DockPanel.Dock="Top"
                                     Header="client settings">
                 <Grid RowDefinitions="Auto,*">
-                    <Grid Grid.Row="0"
-                          RowDefinitions="Auto, Auto">
-                        <TextBlock Grid.Row="0"
-                                   Margin="0,0,4,0"
-                                   Foreground="{StaticResource DarkForegroundBrush}"
-                                   Text="UI scale" />
+                    <Grid Grid.Row="0" ColumnDefinitions="Auto, *">
+                        <Grid Grid.Column="0"
+                              RowDefinitions="Auto, Auto">
+                            <TextBlock Grid.Row="0"
+                                       Grid.Column="0"
+                                       Margin="0,0,4,0"
+                                       Foreground="{StaticResource DarkForegroundBrush}"
+                                       Text="UI scale" />
 
-                        <NumericUpDown Grid.Row="1"
-                                       Width="55"
-                                       Height="28"
-                                       Margin="0,2,0,0"
-                                       HorizontalAlignment="Left"
-                                       HorizontalContentAlignment="Right"
-                                       AllowSpin="True"
-                                       Classes="NormalNumericUpDown"
-                                       ClipValueToMinMax="True"
-                                       FormatString="0.00"
-                                       Maximum="4"
-                                       Minimum="1"
-                                       ParsingNumberStyle="Integer"
-                                       ShowButtonSpinner="True"
-                                       Value="{Binding Client.UiScale, Mode=TwoWay}" />
+                            <NumericUpDown Grid.Row="1"
+                                           Grid.Column="0"
+                                           Width="55"
+                                           Height="28"
+                                           Margin="0,2,0,0"
+                                           HorizontalAlignment="Left"
+                                           HorizontalContentAlignment="Right"
+                                           AllowSpin="True"
+                                           Classes="NormalNumericUpDown"
+                                           ClipValueToMinMax="True"
+                                           FormatString="0.00"
+                                           Maximum="4"
+                                           Minimum="1"
+                                           ParsingNumberStyle="Integer"
+                                           ShowButtonSpinner="True"
+                                           Value="{Binding Client.UiScale, Mode=TwoWay}" />
+                        </Grid>
+
+                        <Grid Grid.Column="1"
+                              RowDefinitions="Auto, Auto">
+                            <TextBlock Grid.Row="0"
+                                       Grid.Column="0"
+                                       Margin="0,0,4,0"
+                                       Foreground="{StaticResource DarkForegroundBrush}"
+                                       Text="Target FPS (0=auto)" />
+
+                            <NumericUpDown Grid.Row="1"
+                                           Grid.Column="0"
+                                           Width="55"
+                                           Height="28"
+                                           Margin="0,2,0,0"
+                                           HorizontalAlignment="Left"
+                                           HorizontalContentAlignment="Right"
+                                           AllowSpin="True"
+                                           Classes="NormalNumericUpDown"
+                                           ClipValueToMinMax="True"
+                                           FormatString="0"
+                                           Maximum="1000"
+                                           Minimum="0"
+                                           ParsingNumberStyle="Integer"
+                                           ShowButtonSpinner="True"
+                                           Value="{Binding Client.Fps, Mode=TwoWay}" />
+                        </Grid>
                     </Grid>
 
                     <HeaderedContentControl Grid.Row="1"
@@ -209,4 +239,4 @@
             </HeaderedContentControl>
         </DockPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>