diff --git a/Casks/teamviewer-host.rb b/Casks/teamviewer-host.rb
index 79fe58b8ad03..656846026cc6 100644
--- a/Casks/teamviewer-host.rb
+++ b/Casks/teamviewer-host.rb
@@ -11,21 +11,7 @@
 
   pkg 'Install TeamViewerHost.pkg'
 
-  uninstall pkgutil:   'com.teamviewer.*',
-            delete:    [
-                         '/Applications/TeamViewerHost.app',
-                         "/Library/Fonts/TeamViewer#{version}Host.otf",
-                         '/Library/PrivilegedHelperTools/com.teamviewer.Helper',
-                         '/Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle',
-                       ],
-            launchctl: [
-                         'com.teamviewer.Helper',
-                         'com.teamviewer.desktop',
-                         'com.teamviewer.service',
-                         'com.teamviewer.teamviewer',
-                         'com.teamviewer.teamviewer_service',
-                       ],
-            quit:      'com.teamviewer.TeamViewerHost'
+  uninstall delete: "#{staged_path}/#{token}" # This Cask should be uninstalled manually.
 
   zap trash: [
                '/Library/Preferences/com.teamviewer.teamviewer.preferences.plist',
diff --git a/Casks/teamviewer.rb b/Casks/teamviewer.rb
index b8112067a566..3fab714cc5da 100644
--- a/Casks/teamviewer.rb
+++ b/Casks/teamviewer.rb
@@ -11,21 +11,7 @@
 
   pkg 'Install TeamViewer.pkg'
 
-  uninstall pkgutil:   'com.teamviewer.*',
-            delete:    [
-                         '/Applications/TeamViewer.app',
-                         "/Library/Fonts/TeamViewer#{version}.otf",
-                         '/Library/PrivilegedHelperTools/com.teamviewer.Helper',
-                         '/Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle',
-                       ],
-            launchctl: [
-                         'com.teamviewer.Helper',
-                         'com.teamviewer.desktop',
-                         'com.teamviewer.service',
-                         'com.teamviewer.teamviewer',
-                         'com.teamviewer.teamviewer_service',
-                       ],
-            quit:      'com.teamviewer.TeamViewer'
+  uninstall delete: "#{staged_path}/#{token}" # This Cask should be uninstalled manually.
 
   zap trash: [
                '/Library/Preferences/com.teamviewer.teamviewer.preferences.plist',