diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 81382f7d..7676dc5a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
     package="com.thejoshwa.ultrasonic.androidapp"
     a:installLocation="auto"
-    a:versionCode="36"
-    a:versionName="1.2.0.9" >
+    a:versionCode="37"
+    a:versionName="1.2.0.10" >
 
     <uses-permission a:name="android.permission.INTERNET" />
     <uses-permission a:name="android.permission.READ_PHONE_STATE" />
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java
index 1ad489e0..43ecd395 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java
@@ -859,25 +859,23 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
 				}
 			}
 
-
 			if (jukeboxOption != null)
 			{
 				jukeboxOption.setEnabled(jukeboxAvailable);
 				jukeboxOption.setVisible(jukeboxAvailable);
 
+				if (!jukeboxAvailable)
+				{
+					downloadService.setJukeboxEnabled(false);
+				}
+
 				if (downloadService.isJukeboxEnabled())
 				{
-					if (jukeboxOption != null)
-					{
-						jukeboxOption.setTitle(R.string.download_menu_jukebox_off);
-					}
+					jukeboxOption.setTitle(R.string.download_menu_jukebox_off);
 				}
 				else
 				{
-					if (jukeboxOption != null)
-					{
-						jukeboxOption.setTitle(R.string.download_menu_jukebox_on);
-					}
+					jukeboxOption.setTitle(R.string.download_menu_jukebox_on);
 				}
 			}
 		}