diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index 90eeb9f8..569ea9f9 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -1119,12 +1119,12 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 //	playMusicTick
 //
 /////////////////////////////////////////////
-#ifndef __PSVITA__ // AP - vita will update the music during the mixer callback
 void SoundEngine::playMusicTick() 
 {
+#ifndef __PSVITA__ // AP - vita will update the music during the mixer callback
 	playMusicUpdate();
-}
 #endif
+}
 
 // AP - moved to a separate function so it can be called from the mixer callback on Vita
 void SoundEngine::playMusicUpdate() 
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h
index e2f79d54..6b7d93aa 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/SoundEngine.h
@@ -98,9 +98,7 @@ public:
 	virtual void play(int iSound, float x, float y, float z, float volume, float pitch);
 	virtual void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true);
 	virtual void playUI(int iSound, float volume, float pitch);
-#ifndef __PSVITA__
 	virtual void playMusicTick();
-#endif
 	virtual void updateMusicVolume(float fVal);
 	virtual void updateSystemMusicPlaying(bool isPlaying);
 	virtual void updateSoundEffectVolume(float fVal);
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 4983a037..1ed05a73 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -205,7 +205,7 @@ CMinecraftApp::CMinecraftApp()
 	m_bUseDPadForDebug = true;
 #endif
 
-#if !(defined _WINDOWS64)
+#if !(defined _WINDOWS64 || _XBOX)
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
 		m_eOptionsStatusA[i]=C4JStorage::eOptions_Callback_Idle;
@@ -729,7 +729,7 @@ void CMinecraftApp::InitGameSettings()
 {
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-#if !(defined _WINDOWS64)
+#if !(defined _WINDOWS64 || _XBOX)
 		GameSettingsA[i]=(GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(i);
 #else
 		GameSettingsA[i]=(GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(i);
@@ -745,7 +745,7 @@ void CMinecraftApp::InitGameSettings()
 		SetDefaultOptions(pProfileSettings,i);
 		ProfileManager.LoadSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
 		ApplyGameSettingsChanged(i);
-#else
+#elif !defined(_XBOX)
 		C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
 		// 4J-PB - don't cause an options write to happen here
 		SetDefaultOptions(pProfileSettings,i,false);
@@ -753,7 +753,7 @@ void CMinecraftApp::InitGameSettings()
 	}
 }
 
-#if !(defined _WINDOWS64)
+#if !(defined _WINDOWS64 || _XBOX)
 int CMinecraftApp::SetDefaultOptions(C4JStorage::PROFILESETTINGS *pSettings,const int iPad,bool bWriteProfile)
 #else
 int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,const int iPad)
@@ -846,7 +846,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
 
 	//#endif
 
-#if !(defined _WINDOWS64)
+#if !(defined _WINDOWS64 || _XBOX)
 	GameSettingsA[iPad]->bSettingsChanged=bWriteProfile;
 #endif
 
@@ -874,7 +874,7 @@ int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C_4JProfile::PROFILESETT
 	return 0;
 }
 
-#if !(defined _WINDOWS64)
+#if !(defined _WINDOWS64 || _XBOX)
 wstring CMinecraftApp::toStringOptionsStatus(const C4JStorage::eOptionsCallback &eStatus)
 {
 #ifndef _CONTENT_PACKAGE
diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
index 5299745d..2317ac8f 100644
--- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
+++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
@@ -717,6 +717,8 @@ int main()
 			}
 		}
 
+		pMinecraft->soundEngine->playMusicTick();
+
 		ui.tick();
 		ui.render();