diff --git a/app/plugin_install.go b/app/plugin_install.go
index 588f86f08c..65e6973562 100644
--- a/app/plugin_install.go
+++ b/app/plugin_install.go
@@ -120,9 +120,8 @@ func (a *App) removePlugin(id string) *model.AppError {
 		a.Publish(message)
 	}
 
-	a.UnregisterPluginCommands(id)
-
 	a.Plugins.Deactivate(id)
+	a.UnregisterPluginCommands(id)
 
 	err = os.RemoveAll(pluginPath)
 	if err != nil {