diff --git a/Source/Project64-core/N64System/FramePerSecondClass.cpp b/Source/Project64-core/N64System/FramePerSecondClass.cpp
index ab2f1af3b..f65e13353 100644
--- a/Source/Project64-core/N64System/FramePerSecondClass.cpp
+++ b/Source/Project64-core/N64System/FramePerSecondClass.cpp
@@ -61,9 +61,11 @@ void CFramePerSecond::Reset(bool ClearDisplay)
 
 void CFramePerSecond::UpdateViCounter(void)
 {
-    if (m_iFrameRateType != FR_VIs &&
-        m_iFrameRateType != FR_VIs_DLs &&
-        m_iFrameRateType != FR_PERCENT)
+    if (!bDisplayFrameRate())
+    {
+        return;
+    }
+    if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_VIs_DLs && m_iFrameRateType != FR_PERCENT)
     {
         return;
     }
@@ -149,6 +151,10 @@ void CFramePerSecond::ScreenHertzChanged(CFramePerSecond * _this)
 
 void CFramePerSecond::UpdateDlCounter(void)
 {
+    if (!bDisplayFrameRate())
+    {
+        return;
+    }
     if (m_iFrameRateType != FR_DLs && m_iFrameRateType != FR_VIs_DLs)
     {
         return;
diff --git a/Source/Project64-core/N64System/FramePerSecondClass.h b/Source/Project64-core/N64System/FramePerSecondClass.h
index 19afef8ed..45fcaa100 100644
--- a/Source/Project64-core/N64System/FramePerSecondClass.h
+++ b/Source/Project64-core/N64System/FramePerSecondClass.h
@@ -10,8 +10,9 @@
 ****************************************************************************/
 #pragma once
 #include <Common/HighResTimeStamp.h>
+#include "../Settings/N64SystemSettings.h"
 
-class CFramePerSecond
+class CFramePerSecond : public CN64SystemSettings
 {
 public:
     CFramePerSecond(void);