diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 4807355..7b99141 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -159,7 +159,6 @@
    private boolean mA2dpDisconnected = false;
    private boolean mA2dpConnected = false;
 
-   private boolean mFmStats = false;
    //Install the death receipient
    private IBinder.DeathRecipient mDeathRecipient;
    private FMDeathRecipient mFMdr;
@@ -2317,9 +2316,6 @@
                 /* reset SSR flag */
            mIsSSRInProgressFromActivity = false;
          }
-
-         if (mReceiver != null)
-            mFmStats = mReceiver.getFmStatsProp();
       }
       return(bStatus);
    }
@@ -3782,7 +3778,10 @@
    }
 
    boolean getFmStatsProp() {
-          return mFmStats;
+          if(mReceiver != null)
+             return mReceiver.getFmStatsProp();
+          else
+             return false;
    }
 
    private void setAlarmSleepExpired (long duration) {
