diff --git a/build/gobind-pinecone/build.sh b/build/gobind-pinecone/build.sh
index 733803027..6fd05a640 100644
--- a/build/gobind-pinecone/build.sh
+++ b/build/gobind-pinecone/build.sh
@@ -6,8 +6,8 @@ while getopts "ai" option
 do
     case "$option"
     in
-    a) gomobile bind -v -target android github.com/matrix-org/dendrite/build/gobind-pinecone ;;
-    i) gomobile bind -v -target ios github.com/matrix-org/dendrite/build/gobind-pinecone ;;
+    a) gomobile bind -v -target android -trimpath -ldflags="-s -w" github.com/matrix-org/dendrite/build/gobind-pinecone ;;
+    i) gomobile bind -v -target ios -trimpath -ldflags="-s -w" github.com/matrix-org/dendrite/build/gobind-pinecone ;;
     *) echo "No target specified, specify -a or -i"; exit 1 ;;
     esac
 done
\ No newline at end of file
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go
index e7a29f366..11900cc5d 100644
--- a/build/gobind-pinecone/monolith.go
+++ b/build/gobind-pinecone/monolith.go
@@ -356,8 +356,8 @@ func (m *DendriteMonolith) Stop() {
 	_ = m.listener.Close()
 	m.PineconeMulticast.Stop()
 	_ = m.PineconeQUIC.Close()
-	_ = m.PineconeRouter.Close()
 	m.processContext.ShutdownDendrite()
+	_ = m.PineconeRouter.Close()
 }
 
 func (m *DendriteMonolith) Suspend() {