diff --git a/app/src/org/meshpoint/anode/AnodeActivity.java b/app/src/org/meshpoint/anode/AnodeActivity.java
index 4f85b93..400200c 100644
--- a/app/src/org/meshpoint/anode/AnodeActivity.java
+++ b/app/src/org/meshpoint/anode/AnodeActivity.java
@@ -151,6 +151,9 @@ private void __stateChanged(final int state) {
 		stopButton.setEnabled(state == Runtime.STATE_STARTED);
 		/* exit the activity if the runtime has exited */
 		if(state == Runtime.STATE_STOPPED) {
+			AnodeService.removeInstance(instance);
+			isolate.removeStateListener(this);
+			isolate = null;
 			finish();
 		}
 	}