diff --git a/src/org/kreed/vanilla/ContextApplication.java b/src/org/kreed/vanilla/ContextApplication.java
index a3af3af0..6806aef0 100644
--- a/src/org/kreed/vanilla/ContextApplication.java
+++ b/src/org/kreed/vanilla/ContextApplication.java
@@ -97,7 +97,9 @@ public class ContextApplication extends Application {
 			mInstance.startService(new Intent(mInstance, PlaybackService.class));
 			while (mService == null) {
 				try {
-					mInstance.wait();
+					synchronized (mInstance) {
+						mInstance.wait();
+					}
 				} catch (InterruptedException e) {
 				}
 			}