diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 2813b3565..4884318f8 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   android:installLocation="auto"
-  android:versionCode="72"
+  android:versionCode="73"
   android:versionName="2.0.6"
   package="com.google.android.maps.mytracks" >
   <!-- Permission to initialize services -->
diff --git a/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java b/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
index b9528365c..b9d4d2d4d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
@@ -32,6 +32,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Button;
 
 import java.util.Locale;
 
@@ -68,13 +69,17 @@ public class HelpActivity extends AbstractMyTracksActivity implements EulaCaller
       webView.restoreState(savedInstanceState);
     }
 
-    findViewById(R.id.help_feedback).setOnClickListener(new View.OnClickListener() {
-
-        @Override
-      public void onClick(View v) {
-        GoogleFeedbackUtils.bindFeedback(HelpActivity.this);
-      }
-    });
+    Button feedback = (Button) findViewById(R.id.help_feedback);
+    boolean showFeedback = ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable();
+    feedback.setVisibility(showFeedback ? View.VISIBLE : View.GONE);
+    if (showFeedback) {
+      feedback.setOnClickListener(new View.OnClickListener() {
+          @Override
+        public void onClick(View v) {
+          GoogleFeedbackUtils.bindFeedback(HelpActivity.this);
+        }
+      });
+    }
   }
 
   @Override