diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba3a0dae..038ee1e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -120,14 +120,6 @@
 				  <category android:name="android.intent.category.HOME" />
 			</intent-filter>
 		</receiver>
-		
-   	<!-- 
-       <service android:name="org.torproject.android.vpn.OrbotVpnService"
-               android:permission="android.permission.BIND_VPN_SERVICE">
-           <intent-filter>
-               <action android:name="android.net.VpnService"/>
-           </intent-filter>
-       </service>
-         -->
+
 </application>
 </manifest> 
diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java
index c5a3ff4f..7b77c0bb 100644
--- a/app/src/main/java/org/torproject/android/OnBootReceiver.java
+++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java
@@ -11,18 +11,21 @@ import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.vpn.VPNEnableActivity;
 
 public class OnBootReceiver extends BroadcastReceiver {
-	
+
+	private static boolean sReceivedBoot = false;
+
 	@Override
 	public void onReceive(Context context, Intent intent) {
 	    Prefs.setContext(context);
-		if (Prefs.startOnBoot())
+		if (Prefs.startOnBoot() && (!sReceivedBoot))
 		{			
 
 			if (Prefs.useVpn())
 				startVpnService(context); //VPN will start Tor once it is done
 			else
 				startService(TorServiceConstants.ACTION_START, context);
-				
+
+			sReceivedBoot = true;
 		}
 	}