diff --git a/src/git_flow/command/branch.py b/src/git_flow/command/branch.py
index b6c8d06..73d1818 100644
--- a/src/git_flow/command/branch.py
+++ b/src/git_flow/command/branch.py
@@ -46,6 +46,7 @@ class BranchCommand(Command):
 
         self.current_branch = Git.get_current_branch()
         self.environments = self.flowconfig["flow.branches"].split(",")
+        (current_environment, _) = self.get_branch_env_and_type(self.current_branch)
 
         if args.trash:
             self.show_branches(TRASH_BRANCH_PREFIX)
@@ -56,7 +57,7 @@ class BranchCommand(Command):
             self.show_all_branches()
         elif args.environment is None:
             self.show_envs()
-            self.show_env_branches(self.current_branch)
+            self.show_env_branches(current_environment)
         elif args.environment in self.environments:
             self.show_envs()
             self.show_env_branches(args.environment)