diff --git a/pymatbridge/matlab/matlabserver.m b/pymatbridge/matlab/matlabserver.m
index 3337b1e..e70bc71 100644
--- a/pymatbridge/matlab/matlabserver.m
+++ b/pymatbridge/matlab/matlabserver.m
@@ -6,6 +6,8 @@ function matlabserver(socket_address)
 json_startup
 messenger('init', socket_address);
 
+c=onCleanup(@()exit);
+
 while(1)
     msg_in = messenger('listen');
     req = json_load(msg_in);
@@ -16,7 +18,6 @@ function matlabserver(socket_address)
 
         case {'exit'}
             messenger('exit');
-            clear mex;
             break;
 
         case {'eval'}
diff --git a/pymatbridge/pymatbridge.py b/pymatbridge/pymatbridge.py
index 31855fa..a0923ff 100644
--- a/pymatbridge/pymatbridge.py
+++ b/pymatbridge/pymatbridge.py
@@ -187,8 +187,7 @@ def _execute_flag(self):  # pragma: no cover
     def _run_server(self):
         code = self._preamble_code()
         code.extend([
-            "matlabserver('%s')" % self.socket_addr,
-            'exit'
+            "matlabserver('%s')" % self.socket_addr
         ])
         command = '%s %s %s "%s"' % (self.executable, self.startup_options,
                                      self._execute_flag(), ','.join(code))